bfs: Use the QueryParserUtils instead of its own copy.

* Ingo copied the methods into a shared location, and then obviously
  "forgot" to let BFS use them. As a side note for Ingo: the complete
  error GCC reported was "std::fssh_size_t" not defined with the macro
  wrapper as code location. The actual problem was a "using std::size_t"
  in some C++ header that accidentally got included after the wrapper.
* The shared Query code is not yet used. That'll be done another time.
* Renamed BFS_SHELL define to FS_SHELL, such that QueryParserUtils can be
  used in any file system shell, not just the bfs_shell.
This commit is contained in:
Axel Dörfler
2014-07-09 22:54:39 +02:00
parent ba32021824
commit de9c061339
16 changed files with 102 additions and 432 deletions
+19 -13
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2001-2009, Axel Dörfler, [email protected].
* Copyright 2001-2014, Axel Dörfler, [email protected].
* Copyright 2010, Clemens Zeidler <[email protected]>
* Copyright 2011, Ingo Weinhold, [email protected].
* This file may be used under the terms of the MIT License.
@@ -27,24 +27,30 @@
// The API is not fully available, just the Query and the Expression class
// are.
#ifdef FS_SHELL
# include <new>
#include <dirent.h>
#include <stdlib.h>
#include <string.h>
# include "fssh_api_wrapper.h"
# include "fssh_auto_deleter.h"
#else
# include <dirent.h>
# include <stdlib.h>
# include <string.h>
#include <algorithm>
#include <new>
# include <algorithm>
# include <new>
#include <fs_interface.h>
#include <fs_query.h>
#include <TypeConstants.h>
# include <fs_interface.h>
# include <fs_query.h>
# include <TypeConstants.h>
#include <util/SinglyLinkedList.h>
#include <util/Stack.h>
# include <util/SinglyLinkedList.h>
# include <util/Stack.h>
#include <query_private.h>
# include <query_private.h>
#include <lock.h>
# include <lock.h>
#endif // !FS_SHELL
#include <file_systems/QueryParserUtils.h>
@@ -1,5 +1,5 @@
/*
* Copyright 2001-2009, Axel Dörfler, [email protected].
* Copyright 2001-2014, Axel Dörfler, [email protected].
* Copyright 2010, Clemens Zeidler <[email protected]>
* Copyright 2011, Ingo Weinhold, [email protected].
* This file may be used under the terms of the MIT License.
@@ -8,9 +8,17 @@
#define _FILE_SYSTEMS_QUERY_PARSER_UTILS_H
#include <sys/cdefs.h>
#ifdef FS_SHELL
# include <new>
# include "fssh_api_wrapper.h"
# include "fssh_auto_deleter.h"
#else
# include <sys/cdefs.h>
# include <SupportDefs.h>
#endif // !FS_SHELL
#include <SupportDefs.h>
namespace QueryParser {