From eb1895d1255f004051b478f6bc79cacbe3c9766c Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Mon, 15 Oct 2012 00:08:18 +0400
Subject: [PATCH] Move mod/box/ src/box. Fix broken packages.
Move mod/box/ src/box. Fix broken packages.
Rename tarantool_cpack.cmake to cpack.cmake.
---
.gitignore | 4 +-
CMakeLists.txt | 3 +-
README | 6 +-
cmake/{tarantool_cpack.cmake => cpack.cmake} | 12 +-
doc/user/configuration-reference.xml | 2 +-
doc/user/stored-procedures.xml | 2 +-
src/CMakeLists.txt | 41 +-
{mod => src}/box/CMakeLists.txt | 24 +-
{mod => src}/box/box.h | 0
{mod => src}/box/box.lua | 0
{mod => src}/box/box.m | 2 +-
{mod => src}/box/box_cfg.cfg_tmpl | 0
{mod => src}/box/box_lua.h | 0
{mod => src}/box/box_lua.m | 0
{mod => src}/box/box_lua_uuid.h | 0
{mod => src}/box/box_lua_uuid.m | 0
{mod => src}/box/index.h | 0
{mod => src}/box/index.m | 0
{mod => src}/box/memcached-grammar.m | 504 +++++++++----------
{mod => src}/box/memcached-grammar.rl | 0
{mod => src}/box/memcached.h | 0
{mod => src}/box/memcached.m | 0
{mod => src}/box/port.h | 0
{mod => src}/box/port.m | 0
{mod => src}/box/request.h | 0
{mod => src}/box/request.m | 0
{mod => src}/box/space.h | 0
{mod => src}/box/space.m | 0
{mod => src}/box/tree.h | 0
{mod => src}/box/tree.m | 0
{mod => src}/box/tuple.h | 0
{mod => src}/box/tuple.m | 0
{mod => src}/box/txn.h | 0
{mod => src}/box/txn.m | 0
test/lib/tarantool_server.py | 2 +-
35 files changed, 320 insertions(+), 282 deletions(-)
rename cmake/{tarantool_cpack.cmake => cpack.cmake} (89%)
rename {mod => src}/box/CMakeLists.txt (67%)
rename {mod => src}/box/box.h (100%)
rename {mod => src}/box/box.lua (100%)
rename {mod => src}/box/box.m (99%)
rename {mod => src}/box/box_cfg.cfg_tmpl (100%)
rename {mod => src}/box/box_lua.h (100%)
rename {mod => src}/box/box_lua.m (100%)
rename {mod => src}/box/box_lua_uuid.h (100%)
rename {mod => src}/box/box_lua_uuid.m (100%)
rename {mod => src}/box/index.h (100%)
rename {mod => src}/box/index.m (100%)
rename {mod => src}/box/memcached-grammar.m (85%)
rename {mod => src}/box/memcached-grammar.rl (100%)
rename {mod => src}/box/memcached.h (100%)
rename {mod => src}/box/memcached.m (100%)
rename {mod => src}/box/port.h (100%)
rename {mod => src}/box/port.m (100%)
rename {mod => src}/box/request.h (100%)
rename {mod => src}/box/request.m (100%)
rename {mod => src}/box/space.h (100%)
rename {mod => src}/box/space.m (100%)
rename {mod => src}/box/tree.h (100%)
rename {mod => src}/box/tree.m (100%)
rename {mod => src}/box/tuple.h (100%)
rename {mod => src}/box/tuple.m (100%)
rename {mod => src}/box/txn.h (100%)
rename {mod => src}/box/txn.m (100%)
diff --git a/.gitignore b/.gitignore
index adbbe16620..1561ac119a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,7 @@ Makefile
CMakeFiles
CMakeCache.txt
cmake_install.cmake
-mod/box/tarantool_box
+src/box/tarantool_box
client/tarantool/tarantool
include/config.h
CPackConfig.cmake
@@ -54,7 +54,7 @@ third_party/luajit/src/lj_recdef.h
third_party/luajit/src/lj_vm.s
*.reject
extra/txt2c
-mod/box/*.lua.c
+src/box/*.lua.c
doc/www-data/*.html
doc/www-data/*.ru.html
doc/www-data.in/download
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d2f2b9b27..824734b9fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,7 +178,6 @@ add_subdirectory(cfg)
add_subdirectory(connector)
add_subdirectory(src)
add_subdirectory(extra)
-add_subdirectory(mod)
add_subdirectory(client)
add_subdirectory(test)
add_subdirectory(doc)
@@ -186,7 +185,7 @@ add_subdirectory(doc)
install (FILES README LICENSE doc/box-protocol.txt
DESTINATION share/doc/tarantool)
-include (cmake/tarantool_cpack.cmake)
+include (cmake/cpack.cmake)
# tarantool info summary (used in server version output)
#
diff --git a/README b/README
index 4c7190f6ba..2a7117c508 100644
--- a/README
+++ b/README
@@ -50,7 +50,7 @@ tarantool $ cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_CLIENT=true
-- builds the command line client.
'make' creates tarantool_box executable in directory
-mod/box and tarantool executable in client/tarantool.
+src/box and tarantool executable in client/tarantool.
There is no 'make install' goal, but no installation
is required either.
@@ -78,10 +78,10 @@ you could follow these steps:
tarantool $ emacs cfg/tarantool_box_cfg.cfg # edit the configuration
# Initialize the storage directory, path to this directory
# is specified in the configuration file:
-tarantool $ mod/box/tarantool_box --config cfg/tarantool_box_cfg.cfg --init-storage
+tarantool $ src/box/tarantool_box --config cfg/tarantool_box_cfg.cfg --init-storage
#
# run
-tarantool $ mod/box/tarantool_box --config cfg/tarantool_box_cfg.cfg
+tarantool $ src/box/tarantool_box --config cfg/tarantool_box_cfg.cfg
Please report bugs at http://bugs.launchpad.net/tarantool.
We also warmly welcome your feedback in the discussion mailing
diff --git a/cmake/tarantool_cpack.cmake b/cmake/cpack.cmake
similarity index 89%
rename from cmake/tarantool_cpack.cmake
rename to cmake/cpack.cmake
index 58ea6701f9..9d89e36630 100644
--- a/cmake/tarantool_cpack.cmake
+++ b/cmake/cpack.cmake
@@ -5,7 +5,7 @@
if ("${CPACK_GENERATOR}" STREQUAL "RPM")
set (CPACK_RPM_PACKAGE_NAME "tarantool")
set (CPACK_RPM_PACKAGE_SUMMARY "tarantool")
- set (CPACK_RPM_PACKAGE_VERSION "${TARANTOOL_VERSION}")
+ set (CPACK_RPM_PACKAGE_VERSION "${PACKAGE_VERSION}")
set (CPACK_RPM_PACKAGE_RELEASE "8")
set (CPACK_RPM_PACKAGE_LICENSE "BSD")
set (CPACK_RPM_PACKAGE_VENDOR "MAIL.RU")
@@ -34,7 +34,7 @@ set (CPACK_SOURCE_IGNORE_FILES
"CMakeFiles" "\\\\.gz" "\\\\.Z" "\\\\.zip" "\\\\.rpm"
"\\\\.o" "\\\\.so" "\\\\.a"
"client/tarantool/tarantool"
- "mod/box/tarantool_box"
+ "src/box/tarantool_box"
"install_manifest.txt"
"cmake_install.cmake" "test/var/"
)
@@ -56,8 +56,8 @@ set (CPACK_SOURCE_IGNORE_FILES "${CPACK_SOURCE_IGNORE_FILES}"
"${CMAKE_SOURCE_DIR}/connector/c/tntnet/Makefile"
"${CMAKE_SOURCE_DIR}/connector/c/tntsql/Makefile"
"${CMAKE_SOURCE_DIR}/connector/c/tntrp/Makefile"
- "${CMAKE_SOURCE_DIR}/mod/Makefile"
- "${CMAKE_SOURCE_DIR}/mod/box/Makefile"
+ "${CMAKE_SOURCE_DIR}/src/Makefile"
+ "${CMAKE_SOURCE_DIR}/src/box/Makefile"
"${CMAKE_SOURCE_DIR}/cfg/Makefile"
"${CMAKE_SOURCE_DIR}/src/Makefile"
"${CMAKE_SOURCE_DIR}/extra/Makefile"
@@ -67,14 +67,14 @@ set (CPACK_SOURCE_IGNORE_FILES "${CPACK_SOURCE_IGNORE_FILES}"
"${CMAKE_SOURCE_DIR}/doc/man/Makefile"
)
-set (CPACK_SOURCE_PACKAGE_FILE_NAME "tarantool-${TARANTOOL_VERSION}-src")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "tarantool-${PACKAGE_VERSION}-src")
#
# Provide options for the binary distribution.
#
string (TOLOWER "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}" platform)
-set (CPACK_PACKAGE_FILE_NAME "tarantool-${TARANTOOL_VERSION}-${platform}")
+set (CPACK_PACKAGE_FILE_NAME "tarantool-${PACKAGE_VERSION}-${platform}")
if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-debug")
endif()
diff --git a/doc/user/configuration-reference.xml b/doc/user/configuration-reference.xml
index 116ae444a3..f7e76ab9cd 100644
--- a/doc/user/configuration-reference.xml
+++ b/doc/user/configuration-reference.xml
@@ -220,7 +220,7 @@ lsn:4 tm:1301572313.691 t:65534 127.0.0.1:52728 UPDATE_FIELDS n:0flags:00000000
parameters in two template files, which are easy to maintain
and extend:
<filename xlink:href="https://github.com/mailru/tarantool/blob/master/cfg/core_cfg.cfg_tmpl">cfg/core_cfg.cfg_tmpl</filename>,
- <filename xlink:href="https://github.com/mailru/tarantool/blob/master/mod/box/box_cfg.cfg_tmpl">mod/box/box_cfg.cfg_tmpl</filename>.
+ <filename xlink:href="https://github.com/mailru/tarantool/blob/master/mod/box/box_cfg.cfg_tmpl">src/box/box_cfg.cfg_tmpl</filename>.
These files can always be used as a reference for any
parameter in this manual.
</para>
diff --git a/doc/user/stored-procedures.xml b/doc/user/stored-procedures.xml
index 79b2ff32fa..642db20b22 100644
--- a/doc/user/stored-procedures.xml
+++ b/doc/user/stored-procedures.xml
@@ -1012,7 +1012,7 @@ localhost> lua t:find(1, 'abc')
functions. For example, instead of <code>box.insert(0, ...)</code>
one can write <code>box.space[0]:insert(...)</code>.
Package source code is available in file <filename
- xlink:href="https://github.com/mailru/tarantool/blob/master/mod/box/box.lua">mod/box/box.lua</filename></para>
+ xlink:href="https://github.com/mailru/tarantool/blob/master/src/box/box.lua">src/box/box.lua</filename></para>
<para>A list of all <code>space</code> members follows.</para>
<varlistentry>
<term><emphasis role="lua">space.n</emphasis></term>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 49000643c7..24f5e046dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -77,7 +77,7 @@ set (recompiled_sources
${CMAKE_SOURCE_DIR}/src/assoc.m
${CMAKE_SOURCE_DIR}/src/admin.m
${CMAKE_SOURCE_DIR}/src/replication.m
- ${CMAKE_SOURCE_DIR}/src/fiber.m PARENT_SCOPE)
+ ${CMAKE_SOURCE_DIR}/src/fiber.m)
set (common_sources
tbuf.m
@@ -148,3 +148,42 @@ if (ENABLE_BACKTRACE AND HAVE_BFD)
endif()
set (common_libraries ${common_libraries} PARENT_SCOPE)
+
+function(tarantool_module mod)
+ set (module_sources ${ARGN})
+ set_source_files_properties(
+ ${CMAKE_SOURCE_DIR}/cfg/tarantool_${mod}_cfg.c
+ PROPERTIES COMPILE_FLAGS "-Wno-unused" GENERATED True)
+ add_executable(tarantool_${mod}
+ ${module_sources}
+ ${CMAKE_SOURCE_DIR}/cfg/tarantool_${mod}_cfg.c)
+
+ set_source_files_properties(${recompiled_sources}
+ PROPERTIES OBJECT_DEPENDS
+ ${CMAKE_SOURCE_DIR}/cfg/tarantool_${mod}_cfg.h)
+
+ add_library(lt${mod} STATIC ${recompiled_sources})
+ set_target_properties(lt${mod} PROPERTIES COMPILE_FLAGS
+ "${core_cflags} ${GCOV_C_FLAGS} -DTARANTOOL_CONFIG='<cfg/tarantool_${mod}_cfg.h>'")
+ add_dependencies(lt${mod} generate_headers generate_admin_m build_bundled_libs)
+
+ target_link_libraries(tarantool_${mod} lt${mod} ${GCOV_LDFLAGS} ${common_libraries})
+ set_target_properties(tarantool_${mod} PROPERTIES COMPILE_FLAGS
+ "${core_cflags} ${GCOV_C_FLAGS}")
+
+ if (ENABLE_STATIC)
+ set_target_properties(tarantool_${mod} PROPERTIES
+ LINK_SEARCH_END_STATIC ON)
+ set (module_link_flags "${module_link_flags} -static")
+ endif()
+
+ if (module_link_flags)
+ set_target_properties(tarantool_${mod} PROPERTIES
+ LINK_FLAGS ${module_link_flags})
+ endif()
+ install (TARGETS tarantool_${mod} DESTINATION bin)
+endfunction()
+
+foreach (module ${TARANTOOL_MODULES})
+add_subdirectory(${module})
+endforeach()
diff --git a/mod/box/CMakeLists.txt b/src/box/CMakeLists.txt
similarity index 67%
rename from mod/box/CMakeLists.txt
rename to src/box/CMakeLists.txt
index 6f35ff32b8..1aa732791c 100644
--- a/mod/box/CMakeLists.txt
+++ b/src/box/CMakeLists.txt
@@ -2,42 +2,42 @@ if (TARGET_OS_DARWIN)
set(module_link_flags "-pagezero_size 10000 -image_base 100000000")
endif()
-add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/mod/box/memcached-grammar.m
+add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/src/box/memcached-grammar.m
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- COMMAND ${RAGEL} -G2 mod/box/memcached-grammar.rl
- -o mod/box/memcached-grammar.m
- DEPENDS ${CMAKE_SOURCE_DIR}/mod/box/memcached-grammar.rl)
+ COMMAND ${RAGEL} -G2 src/box/memcached-grammar.rl
+ -o src/box/memcached-grammar.m
+ DEPENDS ${CMAKE_SOURCE_DIR}/src/box/memcached-grammar.rl)
# Do not clean memcached-grammar.m in 'make clean'.
set_property(DIRECTORY PROPERTY CLEAN_NO_CUSTOM true)
add_custom_target(generate_memcached_grammar_m DEPENDS
- ${CMAKE_SOURCE_DIR}/mod/box/memcached-grammar.m)
+ ${CMAKE_SOURCE_DIR}/src/box/memcached-grammar.m)
# Do not try to randomly re-generate memcached-grammar.m
# after a fresh checkout/branch switch.
execute_process(COMMAND ${CMAKE_COMMAND} -E touch_nocreate
- ${CMAKE_SOURCE_DIR}/mod/box/memcached-grammar.m)
+ ${CMAKE_SOURCE_DIR}/src/box/memcached-grammar.m)
function(lua_source filename)
get_filename_component(module ${filename} NAME_WE)
- ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/mod/box/${filename}.c
+ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/src/box/${filename}.c
COMMAND ${ECHO} 'const char ${module}_lua[] =' > ${filename}.new.c
COMMAND ${CMAKE_BINARY_DIR}/extra/txt2c
- ${CMAKE_SOURCE_DIR}/mod/box/${filename} >> ${filename}.new.c
+ ${CMAKE_SOURCE_DIR}/src/box/${filename} >> ${filename}.new.c
COMMAND ${ECHO} '\;' >> ${filename}.new.c
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${filename}.new.c
- ${CMAKE_BINARY_DIR}/mod/box/${filename}.c
+ ${CMAKE_BINARY_DIR}/src/box/${filename}.c
COMMAND ${CMAKE_COMMAND} -E remove ${filename}.new.c
- DEPENDS ${CMAKE_SOURCE_DIR}/mod/box/${filename})
+ DEPENDS ${CMAKE_SOURCE_DIR}/src/box/${filename} txt2c)
- set(lua_sources ${lua_sources} ${CMAKE_BINARY_DIR}/mod/box/${filename}.c
+ set(lua_sources ${lua_sources} ${CMAKE_BINARY_DIR}/src/box/${filename}.c
PARENT_SCOPE)
endfunction()
lua_source(box.lua)
add_custom_target(generate_lua_sources}
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/mod/box
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/box
DEPENDS ${lua_sources})
set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${lua_sources})
diff --git a/mod/box/box.h b/src/box/box.h
similarity index 100%
rename from mod/box/box.h
rename to src/box/box.h
diff --git a/mod/box/box.lua b/src/box/box.lua
similarity index 100%
rename from mod/box/box.lua
rename to src/box/box.lua
diff --git a/mod/box/box.m b/src/box/box.m
similarity index 99%
rename from mod/box/box.m
rename to src/box/box.m
index 5dd51e7cd0..219b5f091c 100644
--- a/mod/box/box.m
+++ b/src/box/box.m
@@ -40,7 +40,7 @@
#include <tarantool.h>
#include <cfg/tarantool_box_cfg.h>
-#include <mod/box/tuple.h>
+#include "tuple.h"
#include "memcached.h"
#include "box_lua.h"
#include "space.h"
diff --git a/mod/box/box_cfg.cfg_tmpl b/src/box/box_cfg.cfg_tmpl
similarity index 100%
rename from mod/box/box_cfg.cfg_tmpl
rename to src/box/box_cfg.cfg_tmpl
diff --git a/mod/box/box_lua.h b/src/box/box_lua.h
similarity index 100%
rename from mod/box/box_lua.h
rename to src/box/box_lua.h
diff --git a/mod/box/box_lua.m b/src/box/box_lua.m
similarity index 100%
rename from mod/box/box_lua.m
rename to src/box/box_lua.m
diff --git a/mod/box/box_lua_uuid.h b/src/box/box_lua_uuid.h
similarity index 100%
rename from mod/box/box_lua_uuid.h
rename to src/box/box_lua_uuid.h
diff --git a/mod/box/box_lua_uuid.m b/src/box/box_lua_uuid.m
similarity index 100%
rename from mod/box/box_lua_uuid.m
rename to src/box/box_lua_uuid.m
diff --git a/mod/box/index.h b/src/box/index.h
similarity index 100%
rename from mod/box/index.h
rename to src/box/index.h
diff --git a/mod/box/index.m b/src/box/index.m
similarity index 100%
rename from mod/box/index.m
rename to src/box/index.m
diff --git a/mod/box/memcached-grammar.m b/src/box/memcached-grammar.m
similarity index 85%
rename from mod/box/memcached-grammar.m
rename to src/box/memcached-grammar.m
index 90594c4766..587316024c 100644
--- a/mod/box/memcached-grammar.m
+++ b/src/box/memcached-grammar.m
@@ -1,5 +1,5 @@
-#line 1 "mod/box/memcached-grammar.rl"
+#line 1 "src/box/memcached-grammar.rl"
/*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
@@ -30,7 +30,7 @@
*/
-#line 34 "mod/box/memcached-grammar.m"
+#line 34 "src/box/memcached-grammar.m"
static const int memcached_start = 1;
static const int memcached_first_final = 197;
static const int memcached_error = 0;
@@ -38,7 +38,7 @@ static const int memcached_error = 0;
static const int memcached_en_main = 1;
-#line 33 "mod/box/memcached-grammar.rl"
+#line 33 "src/box/memcached-grammar.rl"
static int __attribute__((noinline))
@@ -69,12 +69,12 @@ memcached_dispatch(struct coio *coio, struct iobuf *iobuf)
say_debug("memcached_dispatch '%.*s'", MIN((int)(pe - p), 40) , p);
-#line 73 "mod/box/memcached-grammar.m"
+#line 73 "src/box/memcached-grammar.m"
{
cs = memcached_start;
}
-#line 78 "mod/box/memcached-grammar.m"
+#line 78 "src/box/memcached-grammar.m"
{
if ( p == pe )
goto _test_eof;
@@ -146,7 +146,7 @@ case 5:
goto st0;
goto tr15;
tr15:
-#line 223 "mod/box/memcached-grammar.rl"
+#line 223 "src/box/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -163,7 +163,7 @@ st6:
if ( ++p == pe )
goto _test_eof6;
case 6:
-#line 167 "mod/box/memcached-grammar.m"
+#line 167 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st7;
goto st0;
@@ -177,49 +177,49 @@ case 7:
goto tr17;
goto st0;
tr17:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st8;
st8:
if ( ++p == pe )
goto _test_eof8;
case 8:
-#line 188 "mod/box/memcached-grammar.m"
+#line 188 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto tr18;
if ( 48 <= (*p) && (*p) <= 57 )
goto st8;
goto st0;
tr18:
-#line 246 "mod/box/memcached-grammar.rl"
+#line 246 "src/box/memcached-grammar.rl"
{flags = natoq(fstart, p);}
goto st9;
st9:
if ( ++p == pe )
goto _test_eof9;
case 9:
-#line 202 "mod/box/memcached-grammar.m"
+#line 202 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st9;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr21;
goto st0;
tr21:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st10;
st10:
if ( ++p == pe )
goto _test_eof10;
case 10:
-#line 216 "mod/box/memcached-grammar.m"
+#line 216 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto tr22;
if ( 48 <= (*p) && (*p) <= 57 )
goto st10;
goto st0;
tr22:
-#line 239 "mod/box/memcached-grammar.rl"
+#line 239 "src/box/memcached-grammar.rl"
{
exptime = natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
@@ -230,21 +230,21 @@ st11:
if ( ++p == pe )
goto _test_eof11;
case 11:
-#line 234 "mod/box/memcached-grammar.m"
+#line 234 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st11;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr25;
goto st0;
tr25:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st12;
st12:
if ( ++p == pe )
goto _test_eof12;
case 12:
-#line 248 "mod/box/memcached-grammar.m"
+#line 248 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr26;
case 13: goto tr27;
@@ -254,11 +254,11 @@ case 12:
goto st12;
goto st0;
tr26:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -280,13 +280,13 @@ tr26:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 68 "mod/box/memcached-grammar.rl"
+#line 68 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -297,9 +297,9 @@ tr26:
}
goto st197;
tr30:
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -321,13 +321,13 @@ tr30:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 68 "mod/box/memcached-grammar.rl"
+#line 68 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -338,11 +338,11 @@ tr30:
}
goto st197;
tr39:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -364,13 +364,13 @@ tr39:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 68 "mod/box/memcached-grammar.rl"
+#line 68 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -381,11 +381,11 @@ tr39:
}
goto st197;
tr58:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -407,13 +407,13 @@ tr58:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 97 "mod/box/memcached-grammar.rl"
+#line 97 "src/box/memcached-grammar.rl"
{
struct tbuf *b;
void *value;
@@ -442,9 +442,9 @@ tr58:
}
goto st197;
tr62:
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -466,13 +466,13 @@ tr62:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 97 "mod/box/memcached-grammar.rl"
+#line 97 "src/box/memcached-grammar.rl"
{
struct tbuf *b;
void *value;
@@ -501,11 +501,11 @@ tr62:
}
goto st197;
tr71:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -527,13 +527,13 @@ tr71:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 97 "mod/box/memcached-grammar.rl"
+#line 97 "src/box/memcached-grammar.rl"
{
struct tbuf *b;
void *value;
@@ -562,11 +562,11 @@ tr71:
}
goto st197;
tr91:
-#line 248 "mod/box/memcached-grammar.rl"
+#line 248 "src/box/memcached-grammar.rl"
{cas = natoq(fstart, p);}
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -588,13 +588,13 @@ tr91:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 86 "mod/box/memcached-grammar.rl"
+#line 86 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -607,9 +607,9 @@ tr91:
}
goto st197;
tr95:
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -631,13 +631,13 @@ tr95:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 86 "mod/box/memcached-grammar.rl"
+#line 86 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -650,11 +650,11 @@ tr95:
}
goto st197;
tr105:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -676,13 +676,13 @@ tr105:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 86 "mod/box/memcached-grammar.rl"
+#line 86 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -695,17 +695,17 @@ tr105:
}
goto st197;
tr118:
-#line 249 "mod/box/memcached-grammar.rl"
+#line 249 "src/box/memcached-grammar.rl"
{incr = natoq(fstart, p);}
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 124 "mod/box/memcached-grammar.rl"
+#line 124 "src/box/memcached-grammar.rl"
{
struct meta *m;
struct tbuf *b;
@@ -762,15 +762,15 @@ tr118:
}
goto st197;
tr122:
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 124 "mod/box/memcached-grammar.rl"
+#line 124 "src/box/memcached-grammar.rl"
{
struct meta *m;
struct tbuf *b;
@@ -827,17 +827,17 @@ tr122:
}
goto st197;
tr132:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 124 "mod/box/memcached-grammar.rl"
+#line 124 "src/box/memcached-grammar.rl"
{
struct meta *m;
struct tbuf *b;
@@ -894,15 +894,15 @@ tr132:
}
goto st197;
tr141:
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 179 "mod/box/memcached-grammar.rl"
+#line 179 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -922,21 +922,21 @@ tr141:
}
goto st197;
tr146:
-#line 239 "mod/box/memcached-grammar.rl"
+#line 239 "src/box/memcached-grammar.rl"
{
exptime = natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
exptime = exptime + ev_now();
}
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 179 "mod/box/memcached-grammar.rl"
+#line 179 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -956,17 +956,17 @@ tr146:
}
goto st197;
tr157:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 179 "mod/box/memcached-grammar.rl"
+#line 179 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -986,15 +986,15 @@ tr157:
}
goto st197;
tr169:
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 208 "mod/box/memcached-grammar.rl"
+#line 208 "src/box/memcached-grammar.rl"
{
struct fiber *f = fiber_create("flush_all", flush_all);
fiber_call(f, flush_delay);
@@ -1002,17 +1002,17 @@ tr169:
}
goto st197;
tr174:
-#line 250 "mod/box/memcached-grammar.rl"
+#line 250 "src/box/memcached-grammar.rl"
{flush_delay = natoq(fstart, p);}
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 208 "mod/box/memcached-grammar.rl"
+#line 208 "src/box/memcached-grammar.rl"
{
struct fiber *f = fiber_create("flush_all", flush_all);
fiber_call(f, flush_delay);
@@ -1020,17 +1020,17 @@ tr174:
}
goto st197;
tr185:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 208 "mod/box/memcached-grammar.rl"
+#line 208 "src/box/memcached-grammar.rl"
{
struct fiber *f = fiber_create("flush_all", flush_all);
fiber_call(f, flush_delay);
@@ -1038,15 +1038,15 @@ tr185:
}
goto st197;
tr195:
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 197 "mod/box/memcached-grammar.rl"
+#line 197 "src/box/memcached-grammar.rl"
{
@try {
memcached_get(out, keys_count, keys, show_cas);
@@ -1059,25 +1059,25 @@ tr195:
}
goto st197;
tr213:
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 218 "mod/box/memcached-grammar.rl"
+#line 218 "src/box/memcached-grammar.rl"
{
return -1;
}
goto st197;
tr233:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1099,13 +1099,13 @@ tr233:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 77 "mod/box/memcached-grammar.rl"
+#line 77 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -1116,9 +1116,9 @@ tr233:
}
goto st197;
tr237:
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1140,13 +1140,13 @@ tr237:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 77 "mod/box/memcached-grammar.rl"
+#line 77 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -1157,11 +1157,11 @@ tr237:
}
goto st197;
tr246:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1183,13 +1183,13 @@ tr246:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 77 "mod/box/memcached-grammar.rl"
+#line 77 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
struct tuple *tuple = find(key);
@@ -1200,11 +1200,11 @@ tr246:
}
goto st197;
tr263:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1226,22 +1226,22 @@ tr263:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 63 "mod/box/memcached-grammar.rl"
+#line 63 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
STORE;
}
goto st197;
tr267:
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1263,24 +1263,24 @@ tr267:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 63 "mod/box/memcached-grammar.rl"
+#line 63 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
STORE;
}
goto st197;
tr276:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 252 "mod/box/memcached-grammar.rl"
+#line 252 "src/box/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1302,28 +1302,28 @@ tr276:
goto exit;
}
}
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 63 "mod/box/memcached-grammar.rl"
+#line 63 "src/box/memcached-grammar.rl"
{
key = read_field(keys);
STORE;
}
goto st197;
tr281:
-#line 280 "mod/box/memcached-grammar.rl"
+#line 280 "src/box/memcached-grammar.rl"
{ p++; }
-#line 274 "mod/box/memcached-grammar.rl"
+#line 274 "src/box/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 214 "mod/box/memcached-grammar.rl"
+#line 214 "src/box/memcached-grammar.rl"
{
print_stats(out);
}
@@ -1332,33 +1332,33 @@ st197:
if ( ++p == pe )
goto _test_eof197;
case 197:
-#line 1336 "mod/box/memcached-grammar.m"
+#line 1336 "src/box/memcached-grammar.m"
goto st0;
tr27:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
goto st13;
tr40:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st13;
st13:
if ( ++p == pe )
goto _test_eof13;
case 13:
-#line 1350 "mod/box/memcached-grammar.m"
+#line 1350 "src/box/memcached-grammar.m"
if ( (*p) == 10 )
goto tr30;
goto st0;
tr28:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
goto st14;
st14:
if ( ++p == pe )
goto _test_eof14;
case 14:
-#line 1362 "mod/box/memcached-grammar.m"
+#line 1362 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 32: goto st14;
case 78: goto st15;
@@ -1472,18 +1472,18 @@ case 26:
goto tr45;
goto st0;
tr45:
-#line 288 "mod/box/memcached-grammar.rl"
+#line 288 "src/box/memcached-grammar.rl"
{append = true; }
goto st27;
tr209:
-#line 289 "mod/box/memcached-grammar.rl"
+#line 289 "src/box/memcached-grammar.rl"
{append = false;}
goto st27;
st27:
if ( ++p == pe )
goto _test_eof27;
case 27:
-#line 1487 "mod/box/memcached-grammar.m"
+#line 1487 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 13: goto st0;
case 32: goto st27;
@@ -1492,7 +1492,7 @@ case 27:
goto st0;
goto tr46;
tr46:
-#line 223 "mod/box/memcached-grammar.rl"
+#line 223 "src/box/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -1509,7 +1509,7 @@ st28:
if ( ++p == pe )
goto _test_eof28;
case 28:
-#line 1513 "mod/box/memcached-grammar.m"
+#line 1513 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st29;
goto st0;
@@ -1523,49 +1523,49 @@ case 29:
goto tr49;
goto st0;
tr49:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st30;
st30:
if ( ++p == pe )
goto _test_eof30;
case 30:
-#line 1534 "mod/box/memcached-grammar.m"
+#line 1534 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto tr50;
if ( 48 <= (*p) && (*p) <= 57 )
goto st30;
goto st0;
tr50:
-#line 246 "mod/box/memcached-grammar.rl"
+#line 246 "src/box/memcached-grammar.rl"
{flags = natoq(fstart, p);}
goto st31;
st31:
if ( ++p == pe )
goto _test_eof31;
case 31:
-#line 1548 "mod/box/memcached-grammar.m"
+#line 1548 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st31;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr53;
goto st0;
tr53:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st32;
st32:
if ( ++p == pe )
goto _test_eof32;
case 32:
-#line 1562 "mod/box/memcached-grammar.m"
+#line 1562 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto tr54;
if ( 48 <= (*p) && (*p) <= 57 )
goto st32;
goto st0;
tr54:
-#line 239 "mod/box/memcached-grammar.rl"
+#line 239 "src/box/memcached-grammar.rl"
{
exptime = natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
@@ -1576,21 +1576,21 @@ st33:
if ( ++p == pe )
goto _test_eof33;
case 33:
-#line 1580 "mod/box/memcached-grammar.m"
+#line 1580 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st33;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr57;
goto st0;
tr57:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st34;
st34:
if ( ++p == pe )
goto _test_eof34;
case 34:
-#line 1594 "mod/box/memcached-grammar.m"
+#line 1594 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr58;
case 13: goto tr59;
@@ -1600,30 +1600,30 @@ case 34:
goto st34;
goto st0;
tr59:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
goto st35;
tr72:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st35;
st35:
if ( ++p == pe )
goto _test_eof35;
case 35:
-#line 1615 "mod/box/memcached-grammar.m"
+#line 1615 "src/box/memcached-grammar.m"
if ( (*p) == 10 )
goto tr62;
goto st0;
tr60:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
goto st36;
st36:
if ( ++p == pe )
goto _test_eof36;
case 36:
-#line 1627 "mod/box/memcached-grammar.m"
+#line 1627 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 32: goto st36;
case 78: goto st37;
@@ -1730,7 +1730,7 @@ case 47:
goto st0;
goto tr76;
tr76:
-#line 223 "mod/box/memcached-grammar.rl"
+#line 223 "src/box/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -1747,7 +1747,7 @@ st48:
if ( ++p == pe )
goto _test_eof48;
case 48:
-#line 1751 "mod/box/memcached-grammar.m"
+#line 1751 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st49;
goto st0;
@@ -1761,49 +1761,49 @@ case 49:
goto tr78;
goto st0;
tr78:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st50;
st50:
if ( ++p == pe )
goto _test_eof50;
case 50:
-#line 1772 "mod/box/memcached-grammar.m"
+#line 1772 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto tr79;
if ( 48 <= (*p) && (*p) <= 57 )
goto st50;
goto st0;
tr79:
-#line 246 "mod/box/memcached-grammar.rl"
+#line 246 "src/box/memcached-grammar.rl"
{flags = natoq(fstart, p);}
goto st51;
st51:
if ( ++p == pe )
goto _test_eof51;
case 51:
-#line 1786 "mod/box/memcached-grammar.m"
+#line 1786 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st51;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr82;
goto st0;
tr82:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st52;
st52:
if ( ++p == pe )
goto _test_eof52;
case 52:
-#line 1800 "mod/box/memcached-grammar.m"
+#line 1800 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto tr83;
if ( 48 <= (*p) && (*p) <= 57 )
goto st52;
goto st0;
tr83:
-#line 239 "mod/box/memcached-grammar.rl"
+#line 239 "src/box/memcached-grammar.rl"
{
exptime = natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
@@ -1814,49 +1814,49 @@ st53:
if ( ++p == pe )
goto _test_eof53;
case 53:
-#line 1818 "mod/box/memcached-grammar.m"
+#line 1818 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st53;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr86;
goto st0;
tr86:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st54;
st54:
if ( ++p == pe )
goto _test_eof54;
case 54:
-#line 1832 "mod/box/memcached-grammar.m"
+#line 1832 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto tr87;
if ( 48 <= (*p) && (*p) <= 57 )
goto st54;
goto st0;
tr87:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
goto st55;
st55:
if ( ++p == pe )
goto _test_eof55;
case 55:
-#line 1846 "mod/box/memcached-grammar.m"
+#line 1846 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st55;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr90;
goto st0;
tr90:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st56;
st56:
if ( ++p == pe )
goto _test_eof56;
case 56:
-#line 1860 "mod/box/memcached-grammar.m"
+#line 1860 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr91;
case 13: goto tr92;
@@ -1866,30 +1866,30 @@ case 56:
goto st56;
goto st0;
tr106:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st57;
tr92:
-#line 248 "mod/box/memcached-grammar.rl"
+#line 248 "src/box/memcached-grammar.rl"
{cas = natoq(fstart, p);}
goto st57;
st57:
if ( ++p == pe )
goto _test_eof57;
case 57:
-#line 1881 "mod/box/memcached-grammar.m"
+#line 1881 "src/box/memcached-grammar.m"
if ( (*p) == 10 )
goto tr95;
goto st0;
tr93:
-#line 248 "mod/box/memcached-grammar.rl"
+#line 248 "src/box/memcached-grammar.rl"
{cas = natoq(fstart, p);}
goto st58;
st58:
if ( ++p == pe )
goto _test_eof58;
case 58:
-#line 1893 "mod/box/memcached-grammar.m"
+#line 1893 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr95;
case 13: goto st57;
@@ -1963,14 +1963,14 @@ case 65:
}
goto st0;
tr107:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st66;
st66:
if ( ++p == pe )
goto _test_eof66;
case 66:
-#line 1974 "mod/box/memcached-grammar.m"
+#line 1974 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr95;
case 13: goto st57;
@@ -2014,18 +2014,18 @@ case 70:
goto tr113;
goto st0;
tr113:
-#line 297 "mod/box/memcached-grammar.rl"
+#line 297 "src/box/memcached-grammar.rl"
{incr_sign = -1;}
goto st71;
tr202:
-#line 296 "mod/box/memcached-grammar.rl"
+#line 296 "src/box/memcached-grammar.rl"
{incr_sign = 1; }
goto st71;
st71:
if ( ++p == pe )
goto _test_eof71;
case 71:
-#line 2029 "mod/box/memcached-grammar.m"
+#line 2029 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 13: goto st0;
case 32: goto st71;
@@ -2034,7 +2034,7 @@ case 71:
goto st0;
goto tr114;
tr114:
-#line 223 "mod/box/memcached-grammar.rl"
+#line 223 "src/box/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -2051,7 +2051,7 @@ st72:
if ( ++p == pe )
goto _test_eof72;
case 72:
-#line 2055 "mod/box/memcached-grammar.m"
+#line 2055 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st73;
goto st0;
@@ -2065,14 +2065,14 @@ case 73:
goto tr117;
goto st0;
tr117:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st74;
st74:
if ( ++p == pe )
goto _test_eof74;
case 74:
-#line 2076 "mod/box/memcached-grammar.m"
+#line 2076 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr118;
case 13: goto tr119;
@@ -2082,30 +2082,30 @@ case 74:
goto st74;
goto st0;
tr133:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st75;
tr119:
-#line 249 "mod/box/memcached-grammar.rl"
+#line 249 "src/box/memcached-grammar.rl"
{incr = natoq(fstart, p);}
goto st75;
st75:
if ( ++p == pe )
goto _test_eof75;
case 75:
-#line 2097 "mod/box/memcached-grammar.m"
+#line 2097 "src/box/memcached-grammar.m"
if ( (*p) == 10 )
goto tr122;
goto st0;
tr120:
-#line 249 "mod/box/memcached-grammar.rl"
+#line 249 "src/box/memcached-grammar.rl"
{incr = natoq(fstart, p);}
goto st76;
st76:
if ( ++p == pe )
goto _test_eof76;
case 76:
-#line 2109 "mod/box/memcached-grammar.m"
+#line 2109 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr122;
case 13: goto st75;
@@ -2179,14 +2179,14 @@ case 83:
}
goto st0;
tr134:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st84;
st84:
if ( ++p == pe )
goto _test_eof84;
case 84:
-#line 2190 "mod/box/memcached-grammar.m"
+#line 2190 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr122;
case 13: goto st75;
@@ -2239,7 +2239,7 @@ case 89:
goto st0;
goto tr140;
tr140:
-#line 223 "mod/box/memcached-grammar.rl"
+#line 223 "src/box/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -2256,7 +2256,7 @@ st90:
if ( ++p == pe )
goto _test_eof90;
case 90:
-#line 2260 "mod/box/memcached-grammar.m"
+#line 2260 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr141;
case 13: goto st91;
@@ -2264,7 +2264,7 @@ case 90:
}
goto st0;
tr147:
-#line 239 "mod/box/memcached-grammar.rl"
+#line 239 "src/box/memcached-grammar.rl"
{
exptime = natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
@@ -2272,14 +2272,14 @@ tr147:
}
goto st91;
tr158:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st91;
st91:
if ( ++p == pe )
goto _test_eof91;
case 91:
-#line 2283 "mod/box/memcached-grammar.m"
+#line 2283 "src/box/memcached-grammar.m"
if ( (*p) == 10 )
goto tr141;
goto st0;
@@ -2298,14 +2298,14 @@ case 92:
goto tr144;
goto st0;
tr144:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st93;
st93:
if ( ++p == pe )
goto _test_eof93;
case 93:
-#line 2309 "mod/box/memcached-grammar.m"
+#line 2309 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr146;
case 13: goto tr147;
@@ -2315,7 +2315,7 @@ case 93:
goto st93;
goto st0;
tr148:
-#line 239 "mod/box/memcached-grammar.rl"
+#line 239 "src/box/memcached-grammar.rl"
{
exptime = natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
@@ -2326,7 +2326,7 @@ st94:
if ( ++p == pe )
goto _test_eof94;
case 94:
-#line 2330 "mod/box/memcached-grammar.m"
+#line 2330 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr141;
case 13: goto st91;
@@ -2400,14 +2400,14 @@ case 101:
}
goto st0;
tr159:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st102;
st102:
if ( ++p == pe )
goto _test_eof102;
case 102:
-#line 2411 "mod/box/memcached-grammar.m"
+#line 2411 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr141;
case 13: goto st91;
@@ -2495,18 +2495,18 @@ case 111:
}
goto st0;
tr186:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st112;
tr175:
-#line 250 "mod/box/memcached-grammar.rl"
+#line 250 "src/box/memcached-grammar.rl"
{flush_delay = natoq(fstart, p);}
goto st112;
st112:
if ( ++p == pe )
goto _test_eof112;
case 112:
-#line 2510 "mod/box/memcached-grammar.m"
+#line 2510 "src/box/memcached-grammar.m"
if ( (*p) == 10 )
goto tr169;
goto st0;
@@ -2525,14 +2525,14 @@ case 113:
goto tr172;
goto st0;
tr172:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st114;
st114:
if ( ++p == pe )
goto _test_eof114;
case 114:
-#line 2536 "mod/box/memcached-grammar.m"
+#line 2536 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr174;
case 13: goto tr175;
@@ -2542,14 +2542,14 @@ case 114:
goto st114;
goto st0;
tr176:
-#line 250 "mod/box/memcached-grammar.rl"
+#line 250 "src/box/memcached-grammar.rl"
{flush_delay = natoq(fstart, p);}
goto st115;
st115:
if ( ++p == pe )
goto _test_eof115;
case 115:
-#line 2553 "mod/box/memcached-grammar.m"
+#line 2553 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr169;
case 13: goto st112;
@@ -2623,14 +2623,14 @@ case 122:
}
goto st0;
tr187:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st123;
st123:
if ( ++p == pe )
goto _test_eof123;
case 123:
-#line 2634 "mod/box/memcached-grammar.m"
+#line 2634 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr169;
case 13: goto st112;
@@ -2666,18 +2666,18 @@ case 126:
}
goto st0;
tr191:
-#line 293 "mod/box/memcached-grammar.rl"
+#line 293 "src/box/memcached-grammar.rl"
{show_cas = false;}
goto st127;
tr198:
-#line 294 "mod/box/memcached-grammar.rl"
+#line 294 "src/box/memcached-grammar.rl"
{show_cas = true;}
goto st127;
st127:
if ( ++p == pe )
goto _test_eof127;
case 127:
-#line 2681 "mod/box/memcached-grammar.m"
+#line 2681 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 13: goto st0;
case 32: goto st127;
@@ -2686,7 +2686,7 @@ case 127:
goto st0;
goto tr193;
tr193:
-#line 223 "mod/box/memcached-grammar.rl"
+#line 223 "src/box/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -2703,7 +2703,7 @@ st128:
if ( ++p == pe )
goto _test_eof128;
case 128:
-#line 2707 "mod/box/memcached-grammar.m"
+#line 2707 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr195;
case 13: goto st129;
@@ -2946,7 +2946,7 @@ case 155:
goto st0;
goto tr222;
tr222:
-#line 223 "mod/box/memcached-grammar.rl"
+#line 223 "src/box/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -2963,7 +2963,7 @@ st156:
if ( ++p == pe )
goto _test_eof156;
case 156:
-#line 2967 "mod/box/memcached-grammar.m"
+#line 2967 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st157;
goto st0;
@@ -2977,49 +2977,49 @@ case 157:
goto tr224;
goto st0;
tr224:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st158;
st158:
if ( ++p == pe )
goto _test_eof158;
case 158:
-#line 2988 "mod/box/memcached-grammar.m"
+#line 2988 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto tr225;
if ( 48 <= (*p) && (*p) <= 57 )
goto st158;
goto st0;
tr225:
-#line 246 "mod/box/memcached-grammar.rl"
+#line 246 "src/box/memcached-grammar.rl"
{flags = natoq(fstart, p);}
goto st159;
st159:
if ( ++p == pe )
goto _test_eof159;
case 159:
-#line 3002 "mod/box/memcached-grammar.m"
+#line 3002 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st159;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr228;
goto st0;
tr228:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st160;
st160:
if ( ++p == pe )
goto _test_eof160;
case 160:
-#line 3016 "mod/box/memcached-grammar.m"
+#line 3016 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto tr229;
if ( 48 <= (*p) && (*p) <= 57 )
goto st160;
goto st0;
tr229:
-#line 239 "mod/box/memcached-grammar.rl"
+#line 239 "src/box/memcached-grammar.rl"
{
exptime = natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
@@ -3030,21 +3030,21 @@ st161:
if ( ++p == pe )
goto _test_eof161;
case 161:
-#line 3034 "mod/box/memcached-grammar.m"
+#line 3034 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st161;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr232;
goto st0;
tr232:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st162;
st162:
if ( ++p == pe )
goto _test_eof162;
case 162:
-#line 3048 "mod/box/memcached-grammar.m"
+#line 3048 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr233;
case 13: goto tr234;
@@ -3054,30 +3054,30 @@ case 162:
goto st162;
goto st0;
tr234:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
goto st163;
tr247:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st163;
st163:
if ( ++p == pe )
goto _test_eof163;
case 163:
-#line 3069 "mod/box/memcached-grammar.m"
+#line 3069 "src/box/memcached-grammar.m"
if ( (*p) == 10 )
goto tr237;
goto st0;
tr235:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
goto st164;
st164:
if ( ++p == pe )
goto _test_eof164;
case 164:
-#line 3081 "mod/box/memcached-grammar.m"
+#line 3081 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 32: goto st164;
case 78: goto st165;
@@ -3186,7 +3186,7 @@ case 175:
goto st0;
goto tr252;
tr252:
-#line 223 "mod/box/memcached-grammar.rl"
+#line 223 "src/box/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -3203,7 +3203,7 @@ st176:
if ( ++p == pe )
goto _test_eof176;
case 176:
-#line 3207 "mod/box/memcached-grammar.m"
+#line 3207 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st177;
goto st0;
@@ -3217,49 +3217,49 @@ case 177:
goto tr254;
goto st0;
tr254:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st178;
st178:
if ( ++p == pe )
goto _test_eof178;
case 178:
-#line 3228 "mod/box/memcached-grammar.m"
+#line 3228 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto tr255;
if ( 48 <= (*p) && (*p) <= 57 )
goto st178;
goto st0;
tr255:
-#line 246 "mod/box/memcached-grammar.rl"
+#line 246 "src/box/memcached-grammar.rl"
{flags = natoq(fstart, p);}
goto st179;
st179:
if ( ++p == pe )
goto _test_eof179;
case 179:
-#line 3242 "mod/box/memcached-grammar.m"
+#line 3242 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st179;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr258;
goto st0;
tr258:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st180;
st180:
if ( ++p == pe )
goto _test_eof180;
case 180:
-#line 3256 "mod/box/memcached-grammar.m"
+#line 3256 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto tr259;
if ( 48 <= (*p) && (*p) <= 57 )
goto st180;
goto st0;
tr259:
-#line 239 "mod/box/memcached-grammar.rl"
+#line 239 "src/box/memcached-grammar.rl"
{
exptime = natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
@@ -3270,21 +3270,21 @@ st181:
if ( ++p == pe )
goto _test_eof181;
case 181:
-#line 3274 "mod/box/memcached-grammar.m"
+#line 3274 "src/box/memcached-grammar.m"
if ( (*p) == 32 )
goto st181;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr262;
goto st0;
tr262:
-#line 222 "mod/box/memcached-grammar.rl"
+#line 222 "src/box/memcached-grammar.rl"
{ fstart = p; }
goto st182;
st182:
if ( ++p == pe )
goto _test_eof182;
case 182:
-#line 3288 "mod/box/memcached-grammar.m"
+#line 3288 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 10: goto tr263;
case 13: goto tr264;
@@ -3294,30 +3294,30 @@ case 182:
goto st182;
goto st0;
tr264:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
goto st183;
tr277:
-#line 282 "mod/box/memcached-grammar.rl"
+#line 282 "src/box/memcached-grammar.rl"
{ noreply = true; }
goto st183;
st183:
if ( ++p == pe )
goto _test_eof183;
case 183:
-#line 3309 "mod/box/memcached-grammar.m"
+#line 3309 "src/box/memcached-grammar.m"
if ( (*p) == 10 )
goto tr267;
goto st0;
tr265:
-#line 247 "mod/box/memcached-grammar.rl"
+#line 247 "src/box/memcached-grammar.rl"
{bytes = natoq(fstart, p);}
goto st184;
st184:
if ( ++p == pe )
goto _test_eof184;
case 184:
-#line 3321 "mod/box/memcached-grammar.m"
+#line 3321 "src/box/memcached-grammar.m"
switch( (*p) ) {
case 32: goto st184;
case 78: goto st185;
@@ -3632,7 +3632,7 @@ case 196:
_out: {}
}
-#line 307 "mod/box/memcached-grammar.rl"
+#line 307 "src/box/memcached-grammar.rl"
if (!done) {
diff --git a/mod/box/memcached-grammar.rl b/src/box/memcached-grammar.rl
similarity index 100%
rename from mod/box/memcached-grammar.rl
rename to src/box/memcached-grammar.rl
diff --git a/mod/box/memcached.h b/src/box/memcached.h
similarity index 100%
rename from mod/box/memcached.h
rename to src/box/memcached.h
diff --git a/mod/box/memcached.m b/src/box/memcached.m
similarity index 100%
rename from mod/box/memcached.m
rename to src/box/memcached.m
diff --git a/mod/box/port.h b/src/box/port.h
similarity index 100%
rename from mod/box/port.h
rename to src/box/port.h
diff --git a/mod/box/port.m b/src/box/port.m
similarity index 100%
rename from mod/box/port.m
rename to src/box/port.m
diff --git a/mod/box/request.h b/src/box/request.h
similarity index 100%
rename from mod/box/request.h
rename to src/box/request.h
diff --git a/mod/box/request.m b/src/box/request.m
similarity index 100%
rename from mod/box/request.m
rename to src/box/request.m
diff --git a/mod/box/space.h b/src/box/space.h
similarity index 100%
rename from mod/box/space.h
rename to src/box/space.h
diff --git a/mod/box/space.m b/src/box/space.m
similarity index 100%
rename from mod/box/space.m
rename to src/box/space.m
diff --git a/mod/box/tree.h b/src/box/tree.h
similarity index 100%
rename from mod/box/tree.h
rename to src/box/tree.h
diff --git a/mod/box/tree.m b/src/box/tree.m
similarity index 100%
rename from mod/box/tree.m
rename to src/box/tree.m
diff --git a/mod/box/tuple.h b/src/box/tuple.h
similarity index 100%
rename from mod/box/tuple.h
rename to src/box/tuple.h
diff --git a/mod/box/tuple.m b/src/box/tuple.m
similarity index 100%
rename from mod/box/tuple.m
rename to src/box/tuple.m
diff --git a/mod/box/txn.h b/src/box/txn.h
similarity index 100%
rename from mod/box/txn.h
rename to src/box/txn.h
diff --git a/mod/box/txn.m b/src/box/txn.m
similarity index 100%
rename from mod/box/txn.m
rename to src/box/txn.m
diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py
index 8f35413f34..ec9c3b527a 100644
--- a/test/lib/tarantool_server.py
+++ b/test/lib/tarantool_server.py
@@ -43,7 +43,7 @@ class TarantoolServer(Server):
'*.lua']
def find_exe(self, builddir, silent=True):
- return Server.find_exe(self, "{0}/mod/{1}".format(builddir, self.module), silent)
+ return Server.find_exe(self, "{0}/src/{1}".format(builddir, self.module), silent)
def configure(self, config):
Server.configure(self, config)
--
GitLab