[report-utilities] remove (gnc-commodity-collector-*) functions

These functions are not actually exported in report-system.scm so they
are not generally available to external reports. It should mean
they're safe to remove.

gnucash/report/report-system/html-acct-table.scm

@@ -732,13 +732,12 @@
       ;; ( acct . balance ) cells
       (define (get-balance acct-balances acct)
 	(let ((this-collector (gnc:make-commodity-collector)))
-	  (gnc-commodity-collector-merge 
+	  (this-collector
-	   this-collector 
+           'merge
 	   (or (hash-ref acct-balances (gncAccountGetGUID acct))
 	       ;; return a zero commodity collector
-	       (gnc:make-commodity-collector)
+	       (gnc:make-commodity-collector))
-	       )
+	   #f)
-	   )
 	  this-collector
 	  )
 	)
@@ -754,9 +753,9 @@
 	(let ((this-collector (gnc:make-commodity-collector)))
 	  ;; get the balance of the parent account and stick it on the collector
 	  ;; that nice shiny *NEW* collector!!
-	  (gnc-commodity-collector-merge this-collector (get-balance acct-balances account))
+	  (this-collector 'merge (get-balance acct-balances account) #f)
 	  (for-each
-	   (lambda (x) (if x (gnc-commodity-collector-merge this-collector x)))
+	   (lambda (x) (if x (this-collector 'merge x #f)))
 	   (gnc:account-map-descendants
 	    (lambda (a)
 	      (get-balance acct-balances a ))
@@ -1143,8 +1142,8 @@
   ;; readable.
   (let* ((table (gnc:make-html-table))
 	 )
-    (gnc-commodity-collector-map
+    (amount
-     amount
+     'format
      (lambda (curr val)
        (let ((bal (gnc:make-gnc-monetary curr val)))
 	 (gnc:html-table-append-row!
@@ -1162,7 +1161,8 @@
 	    "number-cell" (exchange-fn bal report-commodity))
 	   )
 	  )
-	 )))
+	 ))
+     #f)
     (gnc:html-table-set-style! table "table" 'attribute(list "style" "width:100%; max-width:20em") 'attribute (list "cellpadding" "0"))
     table))
 

gnucash/report/report-system/html-utilities.scm

@@ -281,18 +281,15 @@
 	;; commodity
 	(commodity-row-helper! 
 	 my-name #f
-	 (if balance 
+	 (and balance
-	     (gnc-commodity-collector-assoc
+              (balance 'getmonetary report-commodity reverse-balance?))
-	      balance report-commodity reverse-balance?)
-	     #f)
 	 main-row-style)
 	;; Special case for stock-accounts: then the foreign commodity
 	;; gets displayed in this line rather then the following lines
 	;; (loop below). Is also used if is-stock-account? is true.
 	(let ((my-balance
-	       (if balance 
+               (and balance
-		   (gnc-commodity-collector-assoc
+                    (balance 'getmonetary my-commodity reverse-balance?))))
-		    balance my-commodity reverse-balance?) #f)))
 	  (set! already-printed my-commodity)
 	  (commodity-row-helper! 
 	   my-name
@@ -304,8 +301,8 @@
     ;; balance and its corresponding value in the
     ;; report-currency. One row for each non-report-currency. 
     (if (and balance (not is-stock-account?))
-	(gnc-commodity-collector-map
+	(balance
-	 balance 
+         'format
 	 (lambda (curr val)
 	   (if (or (gnc-commodity-equiv curr report-commodity)
 		   (and already-printed
@@ -323,7 +320,7 @@
 		  bal
 		  (exchange-fn bal report-commodity)
 		  other-rows-style))))
-	 ))))
+	 #f))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -466,8 +463,7 @@
       (let ((this-collector (my-get-balance-nosub account)))
 	(for-each 
 	 (lambda (x) (if x 
-			 (gnc-commodity-collector-merge
+			 (this-collector 'merge x #f)))
-			  this-collector x )))
 	 (gnc:account-map-descendants
 	  (lambda (a)
 	    ;; Important: Calculate the balance if and only if the
@@ -639,7 +635,7 @@
 				  subaccounts my-get-balance 
 				  gnc-reverse-balance)))
 		 (if thisbalance 
-		     (gnc-commodity-collector-merge subbalance thisbalance))
+		     (subbalance 'merge thisbalance #f))
 		 subbalance)
 	       heading-style
 	       #t #f)))))

gnucash/report/report-system/report-utilities.scm

@@ -363,9 +363,9 @@
       (case action
 	((add) (add-commodity-value commodity amount))
 	((merge) (add-commodity-clist
-		 (gnc-commodity-collector-list commodity)))
+                  (commodity 'list #f #f)))
 	((minusmerge) (minus-commodity-clist
-		      (gnc-commodity-collector-list commodity)))
+                       (commodity 'list #f #f)))
 	((format) (process-commodity-list commodity commoditylist))
 	((reset) (set! commoditylist '()))
 	((getpair) (getpair commodity amount))
@@ -383,28 +383,6 @@
     (for-each (lambda (collector) (merged 'merge collector #f)) collectorlist)
     merged))
 
-;; Bah. Let's get back to normal data types -- this procedure thingy
-;; from above makes every code almost unreadable. First step: replace
-;; all 'action function calls by the normal functions below.
-
-;; CAS: ugh.  Having two usages is even *more* confusing, so let's
-;; please settle on one or the other.  What's Step 2?  How 'bout
-;; documenting the new functions?
-(define (gnc-commodity-collector-add collector commodity amount)
-  (collector 'add commodity amount))
-(define (gnc-commodity-collector-merge collector other-collector)
-  (collector 'merge other-collector #f))
-(define (gnc-commodity-collector-minusmerge collector other-collector)
-  (collector 'minusmerge other-collector #f))
-(define (gnc-commodity-collector-map collector function)
-  (collector 'format function #f))
-(define (gnc-commodity-collector-assoc collector commodity sign?)
-  (collector 'getmonetary commodity sign?))
-(define (gnc-commodity-collector-assoc-pair collector commodity sign?)
-  (collector 'getpair commodity sign?))
-(define (gnc-commodity-collector-list collector)
-  (collector 'list #f #f))
-
 ;; Returns zero if all entries in this collector are zero.
 (define (gnc-commodity-collector-allzero? collector)
   (every zero?
@@ -417,8 +395,7 @@
 (define (gnc:account-get-balance-at-date account date include-children?)
   (let ((collector (gnc:account-get-comm-balance-at-date
                     account date include-children?)))
-    (cadr (gnc-commodity-collector-assoc-pair
+    (cadr (collector 'getpair (xaccAccountGetCommodity account) #f))))
-	   collector (xaccAccountGetCommodity account) #f))))
 
 ;; This works similar as above but returns a commodity-collector, 
 ;; thus takes care of children accounts with different currencies.
@@ -434,7 +411,7 @@
       (if include-children?
 	  (for-each 
 	   (lambda (x) 
-	     (gnc-commodity-collector-merge balance-collector x))
+	     (balance-collector 'merge x #f))
 	   (gnc:account-map-descendants
 	    (lambda (child)
 	      (gnc:account-get-comm-balance-at-date child date #f))
@@ -454,7 +431,7 @@
       (qof-query-destroy query)
 
       (if (and splits (not (null? splits)))
-	  (gnc-commodity-collector-add balance-collector
+	  (balance-collector 'add
                              (xaccAccountGetCommodity account)
                              (xaccSplitGetBalance (car splits))))
       balance-collector))
@@ -473,7 +450,7 @@
     (if include-children?
         (for-each
          (lambda (x)
-           (gnc-commodity-collector-merge value-collector x))
+           (value-collector 'merge x #f))
          (gnc:account-map-descendants
           (lambda (d)
             (gnc:account-get-comm-value-interval d start-date end-date #f))
@@ -520,10 +497,10 @@
   (let ((collector (gnc:make-commodity-collector)))
     (for-each 
      (lambda (acct)
-       ((if (reverse-balance-fn acct)
+       (collector
-	    gnc-commodity-collector-minusmerge
+        (if (reverse-balance-fn acct) 'minusmerge 'merge)
-	    gnc-commodity-collector-merge)
+        (get-balance-fn acct)
-	collector (get-balance-fn acct)))
+        #f))
      accounts)
     collector))
 
@@ -576,8 +553,7 @@
 (define (gnc:account-get-balance-interval account from to include-children?)
   (let ((collector (gnc:account-get-comm-balance-interval
                     account from to include-children?)))
-    (cadr (gnc-commodity-collector-assoc-pair
+    (cadr (collector 'getpair (xaccAccountGetCommodity account) #f))))
-	   collector (xaccAccountGetCommodity account) #f))))
 
 ;; the version which returns a commodity-collector
 (define (gnc:account-get-comm-balance-interval account from to include-children?)
@@ -672,17 +648,12 @@
                               (xaccSplitGetAccount split)))
                   (txn (xaccSplitGetParent split)))
              (if type 
-                (gnc-commodity-collector-add total acct-comm shares)
+                 (total 'add acct-comm shares)
                  (if (not (xaccTransGetIsClosingTxn txn))
-                    (gnc-commodity-collector-add total acct-comm shares)
+                     (total 'add acct-comm shares)))))
-             )))
-           )
 	 (gnc:account-get-trans-type-splits-interval
-          account-list type start-date end-date)
+          account-list type start-date end-date))
-	 )
+    total))
-    total
-    )
-  )
 
 ;; Sums up any splits of a certain type affecting a set of accounts.
 ;; the type is an alist '((str "match me") (cased #f) (regexp #f))
@@ -694,7 +665,7 @@
            (let* ((shares (xaccSplitGetAmount split))
                   (acct-comm (xaccAccountGetCommodity
                               (xaccSplitGetAccount split))))
-             (gnc-commodity-collector-add total acct-comm shares)))
+             (total 'add acct-comm shares)))
 	 (gnc:account-get-trans-type-splits-interval
           account-list type start-date end-date))
     total))
@@ -773,7 +744,7 @@
 			      (xaccSplitGetAccount split)))
 		  )
 	     (or (gnc-numeric-negative-p shares)
-		 (gnc-commodity-collector-add total acct-comm shares)
+		 (total 'add acct-comm shares)
 		 )
 	     )
 	   )