*/
/* }}} */
-#define _GNU_SOURCE
-
-#include <substrate.h>
#include "cycript.hpp"
#include <cstdio>
#include <netinet/in.h>
#include <sys/un.h>
+#include <apr_getopt.h>
+
static volatile enum {
Working,
Parsing,
#if YYDEBUG
static bool bison_;
#endif
+static bool strict_;
+static bool pretty_;
-void Setup(cy::parser &parser) {
+void Setup(CYDriver &driver, cy::parser &parser) {
#if YYDEBUG
if (bison_)
parser.set_debug_level(1);
#endif
+ if (strict_)
+ driver.strict_ = true;
+}
+
+void Setup(CYOutput &out, CYDriver &driver) {
+ out.pretty_ = pretty_;
+
+ CYContext context(driver.pool_);
+ driver.program_->Replace(context);
}
void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
const char *json;
if (socket == -1) {
mode_ = Running;
+#ifdef CY_EXECUTE
json = CYExecute(pool, data);
+#else
+ json = NULL;
+#endif
mode_ = Working;
if (json != NULL)
size = strlen(json);
}
command += line;
- for (char *state, *token(apr_strtok(line, "\n", &state)); token != NULL; token = apr_strtok(NULL, "\n", &state))
- lines.push_back(token);
+
+ char *begin(line), *end(line + strlen(line));
+ while (char *nl = reinterpret_cast<char *>(memchr(begin, '\n', end - begin))) {
+ *nl = '\0';
+ lines.push_back(begin);
+ begin = nl + 1;
+ }
+
+ lines.push_back(begin);
+
free(line);
std::string code;
else {
CYDriver driver("");
cy::parser parser(driver);
- Setup(parser);
+ Setup(driver, parser);
driver.data_ = command.c_str();
driver.size_ = command.size();
if (parser.parse() != 0 || !driver.errors_.empty()) {
for (CYDriver::Errors::const_iterator error(driver.errors_.begin()); error != driver.errors_.end(); ++error) {
cy::position begin(error->location_.begin);
- if (begin.line != lines.size() || begin.column - 1 != lines.back().size()) {
+ if (begin.line != lines.size() || begin.column - 1 != lines.back().size() || error->warning_) {
cy::position end(error->location_.end);
if (begin.line != lines.size()) {
std::cerr << lines[begin.line - 1] << std::endl;
}
- std::cerr << " | ";
+ std::cerr << "....";
for (size_t i(0); i != begin.column - 1; ++i)
std::cerr << '.';
if (begin.line != end.line || begin.column == end.column)
goto read;
}
- if (driver.source_ == NULL)
+ if (driver.program_ == NULL)
goto restart;
if (socket != -1)
else {
std::ostringstream str;
CYOutput out(str);
- driver.source_->Show(out);
+ Setup(out, driver);
+ out << *driver.program_;
code = str.str();
}
}
return base;
}
-int main(int argc, char *argv[]) {
+int main(int argc, char const * const argv[], char const * const envp[]) {
+ _aprcall(apr_app_initialize(&argc, &argv, &envp));
+
bool tty(isatty(STDIN_FILENO));
- pid_t pid(_not(pid_t));
bool compile(false);
- for (;;) switch (getopt(argc, argv, "cg:p:")) {
- case -1:
- goto getopt;
- case '?':
- fprintf(stderr, "usage: cycript [-c] [-p <pid>] [<script> [<arg>...]]\n");
- return 1;
+#ifdef CY_ATTACH
+ pid_t pid(_not(pid_t));
+#endif
- case 'c':
- compile = true;
- break;
+ CYPool pool;
+ apr_getopt_t *state;
+ _aprcall(apr_getopt_init(&state, pool, argc, argv));
- case 'g':
- if (false);
-#if YYDEBUG
- else if (strcmp(optarg, "bison") == 0)
- bison_ = true;
+ for (;;) {
+ char opt;
+ const char *arg;
+
+ apr_status_t status(apr_getopt(state,
+ "cg:n:"
+#ifdef CY_ATTACH
+ "p:"
#endif
- else {
- fprintf(stderr, "invalid name for -g\n");
- return 1;
- }
- break;
-
- case 'p': {
- size_t size(strlen(optarg));
- char *end;
- pid = strtoul(optarg, &end, 0);
- if (optarg + size != end) {
- fprintf(stderr, "invalid pid for -p\n");
+ "s"
+ , &opt, &arg));
+
+ switch (status) {
+ case APR_EOF:
+ goto getopt;
+ case APR_BADCH:
+ case APR_BADARG:
+ fprintf(stderr,
+ "usage: cycript [-c]"
+#ifdef CY_ATTACH
+ " [-p <pid>]"
+#endif
+ " [<script> [<arg>...]]\n"
+ );
return 1;
- }
- } break;
+ default:
+ _aprcall(status);
+ }
+
+ switch (opt) {
+ case 'c':
+ compile = true;
+ break;
+
+ case 'g':
+ if (false);
+#if YYDEBUG
+ else if (strcmp(arg, "bison") == 0)
+ bison_ = true;
+#endif
+ else {
+ fprintf(stderr, "invalid name for -g\n");
+ return 1;
+ }
+ break;
+
+ case 'n':
+ if (false);
+ else if (strcmp(arg, "minify") == 0)
+ pretty_ = true;
+ else {
+ fprintf(stderr, "invalid name for -n\n");
+ return 1;
+ }
+ break;
+
+#ifdef CY_ATTACH
+ case 'p': {
+ size_t size(strlen(arg));
+ char *end;
+ pid = strtoul(arg, &end, 0);
+ if (arg + size != end) {
+ fprintf(stderr, "invalid pid for -p\n");
+ return 1;
+ }
+ } break;
+#endif
+
+ case 's':
+ strict_ = true;
+ break;
+ }
} getopt:;
const char *script;
+ int ind(state->ind);
- if (pid != _not(pid_t) && optind < argc - 1) {
+#ifdef CY_ATTACH
+ if (pid != _not(pid_t) && ind < argc - 1) {
fprintf(stderr, "-p cannot set argv\n");
return 1;
}
fprintf(stderr, "-p conflicts with -c\n");
return 1;
}
+#endif
- if (optind == argc)
+ if (ind == argc)
script = NULL;
else {
+#ifdef CY_EXECUTE
// XXX: const_cast?! wtf gcc :(
- CYSetArgs(argc - optind - 1, const_cast<const char **>(argv + optind + 1));
- script = argv[optind];
+ CYSetArgs(argc - ind - 1, const_cast<const char **>(argv + ind + 1));
+#endif
+ script = argv[ind];
if (strcmp(script, "-") == 0)
script = NULL;
}
- if (script == NULL && !tty && pid != _not(pid_t)) {
- fprintf(stderr, "non-terminal attaching to remove console\n");
+#ifdef CY_ATTACH
+ if (pid != _not(pid_t) && script == NULL && !tty) {
+ fprintf(stderr, "non-terminal attaching to remote console\n");
return 1;
}
+#endif
int socket;
+#ifdef CY_ATTACH
if (pid == _not(pid_t))
socket = -1;
else {
_syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
}
+#else
+ socket = -1;
+#endif
if (script == NULL && tty)
Console(socket);
else {
CYDriver driver(script ?: "<stdin>");
cy::parser parser(driver);
- Setup(parser);
+ Setup(driver, parser);
char *start, *end;
if (parser.parse() != 0 || !driver.errors_.empty()) {
for (CYDriver::Errors::const_iterator i(driver.errors_.begin()); i != driver.errors_.end(); ++i)
std::cerr << i->location_.begin << ": " << i->message_ << std::endl;
- } else if (driver.source_ != NULL)
+ } else if (driver.program_ != NULL)
if (socket != -1)
Run(socket, start, end - start, stdout);
else {
std::ostringstream str;
CYOutput out(str);
- driver.source_->Show(out);
+ Setup(out, driver);
+ out << *driver.program_;
std::string code(str.str());
if (compile)
std::cout << code;
else
- Run(socket, code);
+ Run(socket, code, stdout);
}
}
projects / cycript.git / blobdiff