summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am1
-rw-r--r--src/precmd.cc167
-rw-r--r--src/precmd.h61
-rw-r--r--src/report.cc116
-rw-r--r--src/value.h10
5 files changed, 245 insertions, 110 deletions
diff --git a/Makefile.am b/Makefile.am
index 41d7389e..885ec31d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,6 +82,7 @@ libledger_report_la_SOURCES = \
src/report.cc \
src/filters.cc \
src/chain.cc \
+ src/precmd.cc \
src/output.cc \
src/help.cc
diff --git a/src/precmd.cc b/src/precmd.cc
new file mode 100644
index 00000000..535526b1
--- /dev/null
+++ b/src/precmd.cc
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2003-2009, John Wiegley. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of New Artisans LLC nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "precmd.h"
+#include "report.h"
+
+namespace ledger {
+
+value_t parse_command(call_scope_t& args)
+{
+ var_t<string> arg(args, 0);
+
+ if (! arg) {
+ throw std::logic_error("Usage: parse TEXT");
+ return 1L;
+ }
+
+ report_t& report(find_scope<report_t>(args));
+ std::ostream& out(report.output_stream);
+
+ out << "--- Input text ---" << std::endl;
+ out << *arg << std::endl;
+
+ out << std::endl << "--- Text as parsed ---" << std::endl;
+ expr_t expr(*arg);
+ expr.print(out);
+ out << std::endl;
+
+ out << std::endl << "--- Expression tree ---" << std::endl;
+ expr.dump(out);
+
+ expr.compile(args);
+ out << std::endl << "--- Compiled tree ---" << std::endl;
+ expr.dump(out);
+
+ out << std::endl << "--- Calculated value ---" << std::endl;
+ value_t result(expr.calc(args));
+ result.print(out);
+ out << std::endl;
+
+ out << std::endl << "--- Calculated value as XML ---" << std::endl;
+ result.write_xml(out);
+
+ return 0L;
+}
+
+value_t eval_command(call_scope_t& args)
+{
+ var_t<string> arg(args, 0);
+
+ if (! arg) {
+ throw std::logic_error("Usage: eval TEXT");
+ return 1L;
+ }
+
+ report_t& report(find_scope<report_t>(args));
+ std::ostream& out(report.output_stream);
+
+ expr_t expr(*arg);
+ out << expr.calc(args).strip_annotations() << std::endl;
+ return 0L;
+}
+
+value_t format_command(call_scope_t& args)
+{
+ var_t<string> arg(args, 0);
+
+ if (! arg) {
+ throw std::logic_error("Usage: format TEXT");
+ return 1L;
+ }
+
+ report_t& report(find_scope<report_t>(args));
+ std::ostream& out(report.output_stream);
+
+ format_t fmt(*arg);
+ fmt.dump(out);
+
+ return 0L;
+}
+
+value_t period_command(call_scope_t& args)
+{
+ var_t<string> arg(args, 0);
+
+ if (! arg) {
+ throw std::logic_error("Usage: period TEXT");
+ return 1L;
+ }
+
+ report_t& report(find_scope<report_t>(args));
+ std::ostream& out(report.output_stream);
+
+ interval_t interval(*arg);
+
+ if (! is_valid(interval.begin)) {
+ out << "Time period has no beginning." << std::endl;
+ } else {
+ out << "begin: " << format_date(interval.begin) << std::endl;
+ out << " end: " << format_date(interval.end) << std::endl;
+ out << std::endl;
+
+ date_t date = interval.first();
+
+ for (int i = 0; i < 20; i++) {
+ out << std::right;
+ out.width(2);
+
+ out << i << ": " << format_date(date) << std::endl;
+
+ date = interval.increment(date);
+ if (is_valid(interval.end) && date >= interval.end)
+ break;
+ }
+ }
+ return 0L;
+}
+
+value_t args_command(call_scope_t& args)
+{
+ report_t& report(find_scope<report_t>(args));
+ std::ostream& out(report.output_stream);
+
+ value_t::sequence_t::const_iterator begin = args.value().begin();
+ value_t::sequence_t::const_iterator end = args.value().end();
+
+ out << "--- Input arguments ---" << std::endl;
+ args.value().print(out);
+ out << std::endl << std::endl;
+
+ string predicate = args_to_predicate_expr(begin, end);
+
+ call_scope_t sub_args(static_cast<scope_t&>(args));
+ sub_args.push_back(string_value(predicate));
+
+ return parse_command(sub_args);
+}
+
+} // namespace ledger
diff --git a/src/precmd.h b/src/precmd.h
new file mode 100644
index 00000000..d489b1af
--- /dev/null
+++ b/src/precmd.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2003-2009, John Wiegley. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of New Artisans LLC nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @addtogroup report
+ */
+
+/**
+ * @file precmd.h
+ * @author John Wiegley
+ *
+ * @ingroup report
+ *
+ * @brief Brief
+ *
+ * Long.
+ */
+#ifndef _PRECMD_H
+#define _PRECMD_H
+
+#include "scope.h"
+
+namespace ledger {
+
+value_t parse_command(call_scope_t& args);
+value_t eval_command(call_scope_t& args);
+value_t format_command(call_scope_t& args);
+value_t period_command(call_scope_t& args);
+value_t args_command(call_scope_t& args);
+
+} // namespace ledger
+
+#endif // _PRECMD_H
diff --git a/src/report.cc b/src/report.cc
index a9f4f96b..747af341 100644
--- a/src/report.cc
+++ b/src/report.cc
@@ -34,6 +34,7 @@
#include "filters.h"
#include "chain.h"
#include "output.h"
+#include "precmd.h"
namespace ledger {
@@ -161,116 +162,6 @@ namespace {
return true;
}
};
-
- value_t parse_command(call_scope_t& args)
- {
- var_t<string> arg(args, 0);
-
- if (! arg) {
- throw std::logic_error("Usage: parse TEXT");
- return 1L;
- }
-
- report_t& report(find_scope<report_t>(args));
- std::ostream& out(report.output_stream);
-
- out << "--- Input text ---" << std::endl;
- out << *arg << std::endl;
-
- out << std::endl << "--- Text as parsed ---" << std::endl;
- expr_t expr(*arg);
- expr.print(out);
- out << std::endl;
-
- out << std::endl << "--- Expression tree ---" << std::endl;
- expr.dump(out);
-
- expr.compile(args);
- out << std::endl << "--- Compiled tree ---" << std::endl;
- expr.dump(out);
-
- out << std::endl << "--- Calculated value ---" << std::endl;
- value_t result(expr.calc(args));
- result.print(out);
- out << std::endl;
-
- out << std::endl << "--- Calculated value as XML ---" << std::endl;
- result.write_xml(out);
-
- return 0L;
- }
-
- value_t eval_command(call_scope_t& args)
- {
- var_t<string> arg(args, 0);
-
- if (! arg) {
- throw std::logic_error("Usage: eval TEXT");
- return 1L;
- }
-
- report_t& report(find_scope<report_t>(args));
- std::ostream& out(report.output_stream);
-
- expr_t expr(*arg);
- out << expr.calc(args).strip_annotations() << std::endl;
- return 0L;
- }
-
- value_t format_command(call_scope_t& args)
- {
- var_t<string> arg(args, 0);
-
- if (! arg) {
- throw std::logic_error("Usage: format TEXT");
- return 1L;
- }
-
- report_t& report(find_scope<report_t>(args));
- std::ostream& out(report.output_stream);
-
- format_t fmt(*arg);
- fmt.dump(out);
-
- return 0L;
- }
-
- value_t period_command(call_scope_t& args)
- {
- var_t<string> arg(args, 0);
-
- if (! arg) {
- throw std::logic_error("Usage: period TEXT");
- return 1L;
- }
-
- report_t& report(find_scope<report_t>(args));
- std::ostream& out(report.output_stream);
-
- interval_t interval(*arg);
-
- if (! is_valid(interval.begin)) {
- out << "Time period has no beginning." << std::endl;
- } else {
- out << "begin: " << format_date(interval.begin) << std::endl;
- out << " end: " << format_date(interval.end) << std::endl;
- out << std::endl;
-
- date_t date = interval.first();
-
- for (int i = 0; i < 20; i++) {
- out << std::right;
- out.width(2);
-
- out << i << ": " << format_date(date) << std::endl;
-
- date = interval.increment(date);
- if (is_valid(interval.end) && date >= interval.end)
- break;
- }
- }
- return 0L;
- }
}
expr_t::ptr_op_t report_t::lookup(const string& name)
@@ -343,6 +234,11 @@ expr_t::ptr_op_t report_t::lookup(const string& name)
else if (std::strncmp(p, "ledger_precmd_", 14) == 0) {
p = p + 14;
switch (*p) {
+ case 'a':
+ if (std::strcmp(p, "args") == 0)
+ return WRAP_FUNCTOR(args_command);
+ break;
+
case 'p':
if (std::strcmp(p, "parse") == 0)
return WRAP_FUNCTOR(parse_command);
diff --git a/src/value.h b/src/value.h
index ae6efc62..ea135cdb 100644
--- a/src/value.h
+++ b/src/value.h
@@ -837,6 +837,16 @@ public:
}
}
+ sequence_t::const_iterator begin() const {
+ assert(is_sequence());
+ return as_sequence().begin();
+ }
+
+ sequence_t::const_iterator end() const {
+ assert(is_sequence());
+ return as_sequence().end();
+ }
+
const std::size_t size() const {
if (is_null())
return 0;
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 07:45:57 +0000