Merge commit '900af573319c3787854abc5653c8133d37eb013f'

CMakeLists.txt

@@ -5,7 +5,7 @@ PROJECT(ledger)
 set(Ledger_VERSION_MAJOR 3)
 set(Ledger_VERSION_MINOR 0)
 set(Ledger_VERSION_PATCH 0)
-set(Ledger_VERSION_DATE  20120518)
+set(Ledger_VERSION_DATE  20130523)
 
 enable_testing()
 

acprep

@@ -248,7 +248,7 @@ class PrepareBuild(CommandLineApp):
                 self.envvars[varname] = os.environ[varname]
 
                 if varname.endswith('FLAGS'):
-                    self.__dict__[varname] = string.split(os.environ[varname])
+                    self.__dict__[varname] = str.split(os.environ[varname])
                     self.envvars[varname]  = ''
 
         # If ~/Products/ or build/ exists, use them instead of the source tree

src/account.cc

@@ -380,9 +380,7 @@ expr_t::ptr_op_t account_t::lookup(const symbol_t::kind_t kind,
     break;
 
   case 'd':
-    if (fn_name == "date")
-      return WRAP_FUNCTOR(get_wrapper<&get_latest>);
-    else if (fn_name == "depth")
+    if (fn_name == "depth")
       return WRAP_FUNCTOR(get_wrapper<&get_depth>);
     else if (fn_name == "depth_spacer")
       return WRAP_FUNCTOR(get_wrapper<&get_depth_spacer>);

test/input/drewr3.dat

@@ -53,8 +53,8 @@
   Assets:Savings
   ; :nobudget:
 
-@tag hastag: true
-@tag nestedtag: true
+apply tag hastag: true
+apply tag nestedtag: true
 2011/01/25 Tom's Used Cars
   Expenses:Auto                    $ 5,500.00
   ; :nobudget:
@@ -63,20 +63,20 @@
 2011/01/27 Book Store
   Expenses:Books                       $20.00
   Liabilities:MasterCard
-@end tag nestedtag
+end tag
 2011/12/01 Sale
   Assets:Checking:Business            $ 30.00
   Income:Sales
-@end tag
+end tag
 
-@account Expenses
-@bucket Assets:Checking
+apply account Expenses
+bucket Assets:Checking
 2011/04/25 Tom's Used Cars
   Auto                    $ 5,500.00
   ; :nobudget:
 
-@end account
-@payee Amazon.com  B.*k Store
+end account
+apply payee Amazon.com  B.*k Store
 
 2011/04/27 Book Store
   Books                       $20.00

test/regress/647D5DB9.test

@@ -11,5 +11,5 @@ P 2009/01/31 02:18:02 AAPL $4
 P 3000/01/01 02:18:02 APPL $100
 
 test bal --end 2008/12/31 -JV Equities
-2008-06-30 1500
+2008-12-31 1500
 end test