fix some tests broken by the prepend change.

diff --git a/basis/http/http.factor b/basis/http/http.factor
index f7492d1a23597be5ca7512e984a1b6adec1e23b2..0631b6c67f6c8195ae1c6c5bc6393da06e4e8e9c 100644 (file)
--- a/basis/http/http.factor
+++ b/basis/http/http.factor
@@ -144,8 +144,8 @@ redirects ;
     pick header>> set-at ;
 
 : set-basic-auth ( request username password -- request )
-    ":" glue >base64 "Basic " prepend "Authorization" set-header ;
-    
+    ":" glue >base64 "Basic " "" prepend-as "Authorization" set-header ;
+
 : <request> ( -- request )
     request new
         "1.1" >>version

diff --git a/extra/asn1/asn1.factor b/extra/asn1/asn1.factor
index f43b189eae3298fddb2baead684c880f96edc38d..14fc02f8824fd9e6f115629388e3f8280b0a58e8 100644 (file)
--- a/extra/asn1/asn1.factor
+++ b/extra/asn1/asn1.factor
@@ -153,18 +153,18 @@ SYMBOL: end
 GENERIC: >ber ( obj -- byte-array )
 M: fixnum >ber ( n -- byte-array )
     >128-ber dup length 2 swap 2array
-    "cc" pack-native prepend ;
+    "cc" pack-native B{ } prepend-as ;
 
 : >ber-enumerated ( n -- byte-array )
-    >128-ber >byte-array dup length 10 swap 2array
-    "CC" pack-native prepend ;
+    >128-ber dup length 10 swap 2array
+    "CC" pack-native B{ } prepend-as ;
 
 : >ber-length-encoding ( n -- byte-array )
     dup 127 <= [
         1array "C" pack-be
     ] [
         1array "I" pack-be 0 swap remove dup length
-        0x80 + 1array "C" pack-be prepend
+        0x80 + 1array "C" pack-be B{ } prepend-as
     ] if ;
 
 ! =========================================================
@@ -172,11 +172,11 @@ M: fixnum >ber ( n -- byte-array )
 ! =========================================================
 
 M: bignum >ber ( n -- byte-array )
-    >128-ber >byte-array dup length
+    >128-ber dup length
     dup 126 > [
         "range error in bignum" throw
     ] [
-        2 swap 2array "CC" pack-native prepend
+        2 swap 2array "CC" pack-native B{ } prepend-as
     ] if ;
 
 ! =========================================================

diff --git a/extra/gpu/render/render.factor b/extra/gpu/render/render.factor
index e9a1d9069284b3baccaebaf6da28e5f17c169f8d..08b055e267dcf203c2f4c3540b95680b6815aff8 100755 (executable)
--- a/extra/gpu/render/render.factor
+++ b/extra/gpu/render/render.factor
@@ -216,8 +216,8 @@ M: uniform-tuple (bind-uniforms)
     dup texture-uniform = [ drop 1 ] [ "uniform-tuple-texture-units" word-prop 0 or ] if ;
 
 : all-uniform-tuple-slots ( class -- slots )
-    dup "uniform-tuple-slots" word-prop 
-    [ swap superclass all-uniform-tuple-slots prepend ] [ drop { } ] if* ;
+    dup "uniform-tuple-slots" word-prop
+    [ [ superclass all-uniform-tuple-slots ] dip append ] [ drop { } ] if* ;
 
 DEFER: uniform-texture-accessors
 
@@ -464,7 +464,7 @@ DEFER: [bind-uniform-tuple]
         quot-prefix prepend
     ] 2map :> ( texture-unit' value-cleave )
 
-    texture-unit' 
+    texture-unit'
     value>>-quot { value-cleave 2cleave } append ;
 
 :: [bind-uniform] ( texture-unit uniform prefix -- texture-unit' quot )

diff --git a/extra/mason/report/report.factor b/extra/mason/report/report.factor
index 926207be0033940e90845e97bab4312b8de040eb..4c24906fa8136a444a135105d501a4106c28ef71 100644 (file)
--- a/extra/mason/report/report.factor
+++ b/extra/mason/report/report.factor
@@ -8,7 +8,7 @@ combinators.short-circuit literals splitting ;
 IN: mason.report
 
 : git-link ( id -- link )
-    [ "http://github.com/slavapestov/factor/commit/" prepend ] keep
+    [ "http://github.com/slavapestov/factor/commit/" "" prepend-as ] keep
     [XML <a href=<->><-></a> XML] ;
 
 : common-report ( -- xml )
@@ -44,7 +44,7 @@ IN: mason.report
     [
         error [ error. ] with-string-writer :> error
         file utf8 400 file-tail :> output
-        
+
         [XML
         <h2><-what-></h2>
         Build output:
@@ -118,7 +118,7 @@ IN: mason.report
             test-all-vocabs-file
             test-all-errors-file
             error-dump
-            
+
             "Help lint failures"
             help-lint-vocabs-file
             help-lint-errors-file
@@ -143,4 +143,4 @@ IN: mason.report
     } [ eval-file empty? ] all? ;
 
 : success ( -- status )
-    successful-report build-clean? status-clean status-dirty ? ;
\ No newline at end of file
+    successful-report build-clean? status-clean status-dirty ? ;