fixed: build-func-result now returns (res . end-state)
This commit is contained in:
		
							parent
							
								
									113cd54a71
								
							
						
					
					
						commit
						6a7401cd45
					
				| 
						 | 
					@ -123,15 +123,15 @@
 | 
				
			||||||
      (let ((build-required? (car wants-build?-result))
 | 
					      (let ((build-required? (car wants-build?-result))
 | 
				
			||||||
	    (cooked-state (cdr wants-build?-result)))
 | 
						    (cooked-state (cdr wants-build?-result)))
 | 
				
			||||||
	(if build-required? 
 | 
						(if build-required? 
 | 
				
			||||||
	    (if (null? prereqs-results)
 | 
						    (let* ((build-func (rule-build-func rule))
 | 
				
			||||||
		(make-rule-result wants-build?-result
 | 
							   (build-func-result (if (null? prereqs-results)
 | 
				
			||||||
				  ((rule-build-func rule)
 | 
										  (build-func build-required? cooked-state)
 | 
				
			||||||
				   build-required? cooked-state))
 | 
										  (apply build-func
 | 
				
			||||||
		(make-rule-result wants-build?-result
 | 
											 (append (list build-required?)
 | 
				
			||||||
				  (apply (rule-build-func rule) 
 | 
												 prereqs-results 
 | 
				
			||||||
					 (append (list build-required?)
 | 
												 (list cooked-state)))))
 | 
				
			||||||
						 prereqs-results 
 | 
							   (end-state (cdr build-func-result)))
 | 
				
			||||||
						 (list cooked-state)))))
 | 
						      (make-rule-result wants-build?-result build-func-result))
 | 
				
			||||||
	    (make-rule-result wants-build?-result #f))))))
 | 
						    (make-rule-result wants-build?-result #f))))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define (rule-node/make-links rule connect-ch rule-set)
 | 
					(define (rule-node/make-links rule connect-ch rule-set)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue