Macintosh-SW/mpw-shell
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw-shell.git synced 2024-12-28 09:29:57 +00:00
Code Issues Projects Releases Wiki Activity

offset_range

Browse Source
This commit is contained in:
Kelvin Sherlock 2016-06-22 13:46:19 -04:00
parent ca6d8a453e
commit 6bfad57a35
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
builtins.cpp
View File

@ -8,6 +8,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <iterator>
#include <cstdio> #include <cstdio>
#include <cctype> #include <cctype>
@ -58,6 +59,38 @@ namespace {
return out; return out;
} }
template <class T>
class offset_range {
public:
typedef typename T::iterator iterator;
typedef typename T::const_iterator const_iterator;
offset_range(T &t, size_t offset) : _t(t), _offset(offset)
{}
offset_range(const offset_range &) = default;
offset_range(offset_range &&) = default;
offset_range() = delete;
auto begin() { return std::next(_t.begin(), _offset); }
auto begin() const { return std::next(_t.begin(), _offset); }
auto cbegin() { return std::next(_t.begin(), _offset); }
auto end() { return _t.end(); }
auto end() const { return _t.end(); }
auto cend() const { return _t.cend(); }
private:
T &_t;
size_t _offset;
};
template<class T>
offset_range<T> make_offset_range(T &t, size_t offset) {
return offset_range<T>(t, offset);
}
} }
@ -136,12 +169,11 @@ int builtin_shift(Environment &env, const std::vector<std::string> &tokens, cons
int builtin_unset(Environment &env, const std::vector<std::string> &tokens, const fdmask &) { int builtin_unset(Environment &env, const std::vector<std::string> &tokens, const fdmask &) {
for (auto iter = tokens.begin() + 1; iter != tokens.end(); ++iter) {
const std::string &name = *iter; for (const auto &s : make_offset_range(tokens, 1)) {
env.unset(s);
env.unset(name);
} }
// unset [no arg] removes ALL variables // unset [no arg] removes ALL variables
if (tokens.size() == 1) { if (tokens.size() == 1) {
env.unset(); env.unset();
@ -295,9 +327,7 @@ int builtin_echo(Environment &env, const std::vector<std::string> &tokens, const
bool space = false; bool space = false;
bool n = false; bool n = false;
for (auto iter = tokens.begin() + 1; iter != tokens.end(); ++iter) { for (const auto &s : make_offset_range(tokens, 1)) {
const std::string &s = *iter;
if (s == "-n" || s == "-N") { if (s == "-n" || s == "-N") {
n = true; n = true;
continue; continue;
@ -320,9 +350,7 @@ int builtin_quote(Environment &env, const std::vector<std::string> &tokens, cons
bool space = false; bool space = false;
bool n = false; bool n = false;
for (auto iter = tokens.begin() + 1; iter != tokens.end(); ++iter) { for (const auto &s : make_offset_range(tokens, 1)) {
std::string s = *iter;
if (s == "-n" || s == "-N") { if (s == "-n" || s == "-N") {
n = true; n = true;
continue; continue;
@ -330,8 +358,7 @@ int builtin_quote(Environment &env, const std::vector<std::string> &tokens, cons
if (space) { if (space) {
fputs(" ", stdout); fputs(" ", stdout);
} }
s = quote(std::move(s)); fputs(quote(s).c_str(), stdout);
fputs(s.c_str(), stdout);
space = true; space = true;
} }
if (!n) fputs("\n", stdout); if (!n) fputs("\n", stdout);