diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-06 15:35:16 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-06 15:35:16 -0500 |
| commit | f03d386013f220e5b88a056c514c20319c83e9e7 (patch) | |
| tree | 107234c2ca0947fac84be819611ff5c0c610dac6 /src/predicate.h | |
| parent | 312d4c5f5339c61253e86cd9ce825370eb4be053 (diff) | |
| parent | 205639669981f1ab9dc355d07c60c123c4da0ca0 (diff) | |
| download | fork-ledger-f03d386013f220e5b88a056c514c20319c83e9e7.tar.gz fork-ledger-f03d386013f220e5b88a056c514c20319c83e9e7.tar.bz2 fork-ledger-f03d386013f220e5b88a056c514c20319c83e9e7.zip | |
Merge branch 'next'
Diffstat (limited to 'src/predicate.h')
| -rw-r--r-- | src/predicate.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/predicate.h b/src/predicate.h index 577e872a..739356b6 100644 --- a/src/predicate.h +++ b/src/predicate.h @@ -135,10 +135,11 @@ public: TOK_OR, TOK_EQ, - TOK_ACCOUNT, - TOK_PAYEE, + TOK_DATE, TOK_CODE, + TOK_PAYEE, TOK_NOTE, + TOK_ACCOUNT, TOK_META, TOK_EXPR, @@ -184,10 +185,11 @@ public: case TOK_AND: return "TOK_AND"; case TOK_OR: return "TOK_OR"; case TOK_EQ: return "TOK_EQ"; - case TOK_ACCOUNT: return "TOK_ACCOUNT"; - case TOK_PAYEE: return "TOK_PAYEE"; + case TOK_DATE: return "TOK_DATE"; case TOK_CODE: return "TOK_CODE"; + case TOK_PAYEE: return "TOK_PAYEE"; case TOK_NOTE: return "TOK_NOTE"; + case TOK_ACCOUNT: return "TOK_ACCOUNT"; case TOK_META: return "TOK_META"; case TOK_EXPR: return "TOK_EXPR"; case TERM: return string("TERM(") + *value + ")"; @@ -203,10 +205,11 @@ public: case TOK_AND: return "and"; case TOK_OR: return "or"; case TOK_EQ: return "="; - case TOK_ACCOUNT: return "account"; - case TOK_PAYEE: return "payee"; + case TOK_DATE: return "date"; case TOK_CODE: return "code"; + case TOK_PAYEE: return "payee"; case TOK_NOTE: return "note"; + case TOK_ACCOUNT: return "account"; case TOK_META: return "meta"; case TOK_EXPR: return "expr"; |