Migrate source files into src/ directory

This change moves source files into a src/ directory,
and puts object files into an obj/ directory. The Makefile
and xcode project are updated accordingly.

Fixes #1866

1 files changed, 216 insertions, 0 deletions

diff --git a/src/expand.h b/src/expand.h
new file mode 100644
index 00000000..1f42982b
--- /dev/null
+++ b/src/expand.h
@@ -0,0 +1,216 @@
+/**\file expand.h
+
+   Prototypes for string expansion functions. These functions perform
+   several kinds of parameter expansion. There are a lot of issues
+   with regards to memory allocation. Overall, these functions would
+   benefit from using a more clever memory allocation scheme, perhaps
+   an evil combination of talloc, string buffers and reference
+   counting.
+
+*/
+
+#ifndef FISH_EXPAND_H
+/**
+   Header guard
+*/
+#define FISH_EXPAND_H
+
+#include <wchar.h>
+
+#include "util.h"
+#include "common.h"
+#include "parse_constants.h"
+#include <list>
+
+enum
+{
+    /** Flag specifying that cmdsubst expansion should be skipped */
+    EXPAND_SKIP_CMDSUBST = 1 << 0,
+
+    /** Flag specifying that variable expansion should be skipped */
+    EXPAND_SKIP_VARIABLES = 1 << 1,
+
+    /** Flag specifying that wildcard expansion should be skipped */
+    EXPAND_SKIP_WILDCARDS = 1 << 2,
+
+    /**
+       Incomplete matches in the last segment are ok (for tab
+       completion). An incomplete match is a wildcard that matches a
+       prefix of the filename. If accept_incomplete is true, only the
+       remainder of the string is returned.
+    */
+    ACCEPT_INCOMPLETE = 1 << 3,
+
+    /** Only match files that are executable by the current user. Only applicable together with ACCEPT_INCOMPLETE. */
+    EXECUTABLES_ONLY = 1 << 4,
+
+    /** Only match directories. Only applicable together with ACCEPT_INCOMPLETE. */
+    DIRECTORIES_ONLY = 1 << 5,
+
+    /** Don't generate descriptions */
+    EXPAND_NO_DESCRIPTIONS = 1 << 6,
+
+    /** Don't expand jobs (but you can still expand processes). This is because job expansion is not thread safe. */
+    EXPAND_SKIP_JOBS = 1 << 7,
+
+    /** Don't expand home directories */
+    EXPAND_SKIP_HOME_DIRECTORIES = 1 << 8,
+
+    /** Allow fuzzy matching */
+    EXPAND_FUZZY_MATCH = 1 << 9
+};
+typedef int expand_flags_t;
+
+/**
+  Use unencoded private-use keycodes for internal characters
+*/
+#define EXPAND_RESERVED 0xf000
+/**
+   End of range reserved for expand
+ */
+#define EXPAND_RESERVED_END 0xf000f
+
+class completion_t;
+
+enum
+{
+    /** Character represeting a home directory */
+    HOME_DIRECTORY = EXPAND_RESERVED,
+
+    /** Character represeting process expansion */
+    PROCESS_EXPAND,
+
+    /** Character representing variable expansion */
+    VARIABLE_EXPAND,
+
+    /** Character rpresenting variable expansion into a single element*/
+    VARIABLE_EXPAND_SINGLE,
+
+    /** Character representing the start of a bracket expansion */
+    BRACKET_BEGIN,
+
+    /** Character representing the end of a bracket expansion */
+    BRACKET_END,
+
+    /** Character representing separation between two bracket elements */
+    BRACKET_SEP,
+    /**
+       Separate subtokens in a token with this character.
+    */
+    INTERNAL_SEPARATOR,
+
+    /**
+       Character representing an empty variable expansion.
+       Only used transitively while expanding variables.
+    */
+    VARIABLE_EXPAND_EMPTY,
+}
+;
+
+
+/**
+   These are the possible return values for expand_string
+*/
+enum
+{
+    /** Error */
+    EXPAND_ERROR,
+    /** Ok */
+    EXPAND_OK,
+    /** Ok, a wildcard in the string matched no files */
+    EXPAND_WILDCARD_NO_MATCH,
+    /* Ok, a wildcard in the string matched a file */
+    EXPAND_WILDCARD_MATCH
+};
+
+/** Character for separating two array elements. We use 30, i.e. the ascii record separator since that seems logical. */
+#define ARRAY_SEP ((wchar_t)(0x1e))
+
+/** String containing the character for separating two array elements */
+#define ARRAY_SEP_STR L"\x1e"
+
+/**
+   Error issued on array out of bounds
+*/
+#define ARRAY_BOUNDS_ERR _(L"Array index out of bounds")
+
+class parser_t;
+
+/**
+   Perform various forms of expansion on in, such as tilde expansion
+   (\~USER becomes the users home directory), variable expansion
+   (\$VAR_NAME becomes the value of the environment variable VAR_NAME),
+   cmdsubst expansion and wildcard expansion. The results are inserted
+   into the list out.
+
+   If the parameter does not need expansion, it is copied into the list
+   out.
+
+   \param input The parameter to expand
+   \param output The list to which the result will be appended.
+   \param flag Specifies if any expansion pass should be skipped. Legal values are any combination of EXPAND_SKIP_CMDSUBST EXPAND_SKIP_VARIABLES and EXPAND_SKIP_WILDCARDS
+   \param errors Resulting errors, or NULL to ignore
+   \return One of EXPAND_OK, EXPAND_ERROR, EXPAND_WILDCARD_MATCH and EXPAND_WILDCARD_NO_MATCH. EXPAND_WILDCARD_NO_MATCH and EXPAND_WILDCARD_MATCH are normal exit conditions used only on strings containing wildcards to tell if the wildcard produced any matches.
+*/
+__warn_unused int expand_string(const wcstring &input, std::vector<completion_t> &output, expand_flags_t flags, parse_error_list_t *errors);
+
+
+/**
+   expand_one is identical to expand_string, except it will fail if in
+   expands to more than one string. This is used for expanding command
+   names.
+
+   \param inout_str The parameter to expand in-place
+   \param flag Specifies if any expansion pass should be skipped. Legal values are any combination of EXPAND_SKIP_CMDSUBST EXPAND_SKIP_VARIABLES and EXPAND_SKIP_WILDCARDS
+   \param errors Resulting errors, or NULL to ignore
+   \return Whether expansion succeded
+*/
+bool expand_one(wcstring &inout_str, expand_flags_t flags, parse_error_list_t *errors = NULL);
+
+/**
+   Convert the variable value to a human readable form, i.e. escape things, handle arrays, etc. Suitable for pretty-printing. The result must be free'd!
+
+   \param in the value to escape
+*/
+wcstring expand_escape_variable(const wcstring &in);
+
+/**
+   Perform tilde expansion and nothing else on the specified string, which is modified in place.
+
+   \param input the string to tilde expand
+*/
+void expand_tilde(wcstring &input);
+
+/** Perform the opposite of tilde expansion on the string, which is modified in place */
+wcstring replace_home_directory_with_tilde(const wcstring &str);
+
+/**
+   Test if the specified argument is clean, i.e. it does not contain
+   any tokens which need to be expanded or otherwise altered. Clean
+   strings can be passed through expand_string and expand_one without
+   changing them. About two thirds of all strings are clean, so
+   skipping expansion on them actually does save a small amount of
+   time, since it avoids multiple memory allocations during the
+   expansion process.
+
+   \param in the string to test
+*/
+int expand_is_clean(const wchar_t *in);
+
+/**
+   Testing function for getting all process names.
+*/
+std::vector<wcstring> expand_get_all_process_names(void);
+
+/** Abbreviation support. Expand src as an abbreviation, returning true if one was found, false if not. If result is not-null, returns the abbreviation by reference. */
+#define USER_ABBREVIATIONS_VARIABLE_NAME L"fish_user_abbreviations"
+bool expand_abbreviation(const wcstring &src, wcstring *output);
+
+/* Terrible hacks */
+bool fish_xdm_login_hack_hack_hack_hack(std::vector<std::string> *cmds, int argc, const char * const *argv);
+bool fish_openSUSE_dbus_hack_hack_hack_hack(std::vector<completion_t> *args);
+
+
+#endif
+
+