>From 0639ebf99f92caed56a3530309460affe2c125ed Mon Sep 17 00:00:00 2001
From: Evan Hanson <address@hidden>
Date: Mon, 20 Apr 2015 18:55:57 +1200
Subject: [PATCH 2/2] Remove c-platform rewrites for srfi-1 identifiers

---
 c-platform.scm | 42 ++----------------------------------------
 manual/faq     |  9 ---------
 2 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/c-platform.scm b/c-platform.scm
index 7fea52c..c6777f9 100644
--- a/c-platform.scm
+++ b/c-platform.scm
@@ -463,11 +463,7 @@
   (rewrite-c..r '##sys#cdr "C_i_cdr" "C_u_i_cdr" 0)
   (rewrite-c..r 'cadr "C_i_cadr" "C_u_i_cadr" 1)
   (rewrite-c..r 'caddr "C_i_caddr" "C_u_i_caddr" 2)
-  (rewrite-c..r 'cadddr "C_i_cadddr" "C_u_i_cadddr" 3)
-  (rewrite-c..r 'first "C_i_car" "C_u_i_car" 0)
-  (rewrite-c..r 'second "C_i_cadr" "C_u_i_cadr" 1)
-  (rewrite-c..r 'third "C_i_caddr" "C_u_i_caddr" 2)
-  (rewrite-c..r 'fourth "C_i_cadddr" "C_u_i_cadddr" 3) )
+  (rewrite-c..r 'cadddr "C_i_cadddr" "C_u_i_cadddr" 3))
 
 (let ([rvalues
        (lambda (db classargs cont callargs)
@@ -989,9 +985,7 @@
 (rewrite 'f32vector-length 2 1 "C_u_i_32vector_length" #f)
 (rewrite 'f64vector-length 2 1 "C_u_i_64vector_length" #f)
 
-(rewrite 'not-pair? 17 1 "C_i_not_pair_p")
 (rewrite 'atom? 17 1 "C_i_not_pair_p")
-(rewrite 'null-list? 17 1 "C_i_null_list_p" "C_i_nullp")
 
 (rewrite 'u8vector->blob/shared 7 1 "C_slot" 1 #f)
 (rewrite 's8vector->blob/shared 7 1 "C_slot" 1 #f)
@@ -1139,36 +1133,4 @@
 (rewrite 'get-keyword 7 2 "C_i_get_keyword" #f #t)
 (rewrite '##sys#get-keyword 7 2 "C_i_get_keyword" #f #t)
 
-(rewrite 
- 'alist-cons 8
- (lambda (db classargs cont callargs)
-   (and (= 3 (length callargs))
-	(make-node
-	 '##core#call (list #t)
-	 (list cont
-	       (make-node
-		'##core#inline_allocate
-		'("C_a_i_cons" 3) 
-		(list (make-node
-		       '##core#inline_allocate
-		       '("C_a_i_cons" 3)
-		       (list (first callargs) (second callargs)))
-		      (third callargs))))))))
-
-(rewrite 
- 'xcons 8
- (lambda (db classargs cont callargs)
-   (and (= 2 (length callargs))
-	(let ((tmp (gensym)))
-	  (make-node 
-	   'let (list tmp)		; preserve order of argument evaluation
-	   (list
-	    (first callargs)
-	    (make-node
-	     '##core#call (list #t)
-	     (list cont
-		   (make-node
-		    '##core#inline_allocate
-		    '("C_a_i_cons" 3) 
-		    (list (second callargs) (varnode tmp)))))))))))
-)
\ No newline at end of file
+)
diff --git a/manual/faq b/manual/faq
index 1c0d72c..f9a0cbb 100644
--- a/manual/faq
+++ b/manual/faq
@@ -448,7 +448,6 @@ and compiler settings:
 {{exp}}
 {{floor}}
 {{for-each}}
-{{for-each}}
 {{gcd}}
 {{inexact->exact}}
 {{inexact?}}
@@ -510,7 +509,6 @@ and compiler settings:
 The following extended bindings are handled specially: 
 
 {{add1}}
-{{alist-cons}}
 {{any?}}
 {{arithmetic-shift}}
 {{atom?}}
@@ -535,14 +533,12 @@ The following extended bindings are handled specially:
 {{f64vector-length}}
 {{f64vector-ref}}
 {{finite?}}
-{{first}}
 {{fixnum?}}
 {{flonum?}}
 {{flush-output}}
 {{foldl}}
 {{foldr}}
 {{format}}
-{{fourth}}
 {{fp*}}
 {{fp+}}
 {{fp-}}
@@ -604,8 +600,6 @@ The following extended bindings are handled specially:
 {{locative-set!}}
 {{locative?}}
 {{make-record-instance}}
-{{not-pair?}}
-{{null-list?}}
 {{null-pointer?}}
 {{number-of-slots}}
 {{o}}
@@ -643,7 +637,6 @@ The following extended bindings are handled specially:
 {{s8vector-length}}
 {{s8vector-ref}}
 {{s8vector-set!}}
-{{second}}
 {{signum}}
 {{sprintf}}
 {{string-append}}
@@ -654,7 +647,6 @@ The following extended bindings are handled specially:
 {{substring-index-ci}}
 {{substring-index}}
 {{substring=?}}
-{{third}}
 {{u16vector->blob/shared}}
 {{u16vector-length}}
 {{u16vector-ref}}
@@ -668,7 +660,6 @@ The following extended bindings are handled specially:
 {{u8vector-ref}}
 {{u8vector-set!}}
 {{vector->list}}
-{{xcons}}
 
 ==== What's the difference betweem "block" and "local" mode?
 
-- 
2.1.4