summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCandyAngel <candyangel@electricjungle.org>2020-03-31 12:47:53 +0100
committerMartin Michlmayr <tbm@cyrius.com>2020-04-03 08:40:25 +0800
commit43b07fbab3b4c144eca4a771524e59c531ffa074 (patch)
tree3a5433652386149a73328058716dbb09deb8aa8f
parent0703956e78d1d0352e69273295a0301586f86ca8 (diff)
downloadfork-ledger-43b07fbab3b4c144eca4a771524e59c531ffa074.tar.gz
fork-ledger-43b07fbab3b4c144eca4a771524e59c531ffa074.tar.bz2
fork-ledger-43b07fbab3b4c144eca4a771524e59c531ffa074.zip
Make explicit option a no-op
Fixes #1877
-rw-r--r--doc/NEWS.md4
-rw-r--r--doc/ledger.16
-rw-r--r--doc/ledger3.texi6
-rw-r--r--src/journal.cc13
-rw-r--r--src/journal.h5
-rw-r--r--src/session.cc5
-rw-r--r--test/baseline/opt-check-payees.test2
7 files changed, 8 insertions, 33 deletions
diff --git a/doc/NEWS.md b/doc/NEWS.md
index 1d1e618d..98d63384 100644
--- a/doc/NEWS.md
+++ b/doc/NEWS.md
@@ -4,6 +4,10 @@
- Add support for '%F' date format specifier (bug #1775)
+- Entities are no longer regarded as defined due to being part of a cleared
+ transaction. `--explicit` is effectively enabled by default and is now a
+ no-op.
+
## 3.1.3 (2019-03-31)
- Properly reject postings with a comment right after the flag (bug #1753)
diff --git a/doc/ledger.1 b/doc/ledger.1
index 0cad1e0e..b652c76a 100644
--- a/doc/ledger.1
+++ b/doc/ledger.1
@@ -576,12 +576,6 @@ posting occurring in that period.
Display values in terms of the given
.Ar COMMODITY .
The latest available price is used.
-.It Fl \-explicit
-Direct
-.Nm
-to require pre-declarations for entities (such as accounts,
-commodities and tags) rather than taking entities from cleared
-transactions as defined.
.It Fl \-file Ar FILE Pq Fl f
Read journal data from
.Ar FILE .
diff --git a/doc/ledger3.texi b/doc/ledger3.texi
index bf446716..e3d7b442 100644
--- a/doc/ledger3.texi
+++ b/doc/ledger3.texi
@@ -6085,12 +6085,6 @@ Direct Ledger to download prices.
@c using the script defined via the option
@c @option{--getquote @var{FILE}}.
-@item --explicit
-Direct Ledger to require pre-declarations for entities (such as accounts,
-commodities and tags) rather than taking entities from cleared
-transactions as defined. This option is useful in combination with
-@option{--strict} or @option{--pedantic}.
-
@item --file @var{FILE}
@itemx -f @var{FILE}
Specify the input @file{FILE} for this invocation.
diff --git a/src/journal.cc b/src/journal.cc
index 6b28f519..cffab35f 100644
--- a/src/journal.cc
+++ b/src/journal.cc
@@ -86,13 +86,8 @@ void journal_t::initialize()
{
master = new account_t;
bucket = NULL;
- fixed_accounts = false;
- fixed_payees = false;
- fixed_commodities = false;
- fixed_metadata = false;
current_context = NULL;
was_loaded = false;
- force_checking = false;
check_payees = false;
day_break = false;
checking_style = CHECK_NORMAL;
@@ -148,8 +143,6 @@ account_t * journal_t::register_account(const string& name, post_t * post,
if (checking_style == CHECK_WARNING || checking_style == CHECK_ERROR) {
if (! result->has_flags(ACCOUNT_KNOWN)) {
if (! post) {
- if (force_checking)
- fixed_accounts = true;
result->add_flags(ACCOUNT_KNOWN);
}
else if (checking_style == CHECK_WARNING) {
@@ -230,8 +223,6 @@ string journal_t::register_payee(const string& name, xact_t * xact)
if (i == known_payees.end()) {
if (! xact) {
- if (force_checking)
- fixed_payees = true;
known_payees.insert(name);
}
else if (checking_style == CHECK_WARNING) {
@@ -259,8 +250,6 @@ void journal_t::register_commodity(commodity_t& comm,
if (checking_style == CHECK_WARNING || checking_style == CHECK_ERROR) {
if (! comm.has_flags(COMMODITY_KNOWN)) {
if (context.which() == 0) {
- if (force_checking)
- fixed_commodities = true;
comm.add_flags(COMMODITY_KNOWN);
}
else if (checking_style == CHECK_WARNING) {
@@ -281,8 +270,6 @@ void journal_t::register_metadata(const string& key, const value_t& value,
if (i == known_tags.end()) {
if (context.which() == 0) {
- if (force_checking)
- fixed_metadata = true;
known_tags.insert(key);
}
else if (checking_style == CHECK_WARNING) {
diff --git a/src/journal.h b/src/journal.h
index 0b0c7850..3203d3c9 100644
--- a/src/journal.h
+++ b/src/journal.h
@@ -110,12 +110,7 @@ public:
std::list<fileinfo_t> sources;
std::set<string> known_payees;
std::set<string> known_tags;
- bool fixed_accounts;
- bool fixed_payees;
- bool fixed_commodities;
- bool fixed_metadata;
bool was_loaded;
- bool force_checking;
bool check_payees;
bool day_break;
bool recursive_aliases;
diff --git a/src/session.cc b/src/session.cc
index 427850d9..569cbc24 100644
--- a/src/session.cc
+++ b/src/session.cc
@@ -113,8 +113,9 @@ std::size_t session_t::read_data(const string& master_account)
if (HANDLED(no_aliases))
journal->no_aliases = true;
- if (HANDLED(explicit))
- journal->force_checking = true;
+ if (HANDLED(explicit)) {
+ // No-op
+ }
if (HANDLED(check_payees))
journal->check_payees = true;
diff --git a/test/baseline/opt-check-payees.test b/test/baseline/opt-check-payees.test
index 923729e7..f8f4f592 100644
--- a/test/baseline/opt-check-payees.test
+++ b/test/baseline/opt-check-payees.test
@@ -20,7 +20,7 @@ tag food
Expenses:Food 20.00 EUR
Assets:Cash
-test bal --explicit --strict --check-payees
+test bal --strict --check-payees
-20.00 EUR
-570.00 GBP Assets:Cash
20.00 EUR