use radix literals

[factor.git] / extra / id3 / id3.factor

diff --git a/extra/id3/id3.factor b/extra/id3/id3.factor
index 6a14280e6e8b7915864562d409af1d757d06a010..f1ee2210612462fba15c6d38161648dba625b8ef 100644 (file)
--- a/extra/id3/id3.factor
+++ b/extra/id3/id3.factor
@@ -106,7 +106,7 @@ CONSTANT: id3v1+-length 227
 
 : synchsafe>seq ( n -- seq )
     dup 1 + log2 1 + 7 / ceiling
-    [ [ -7 shift ] keep HEX: 7f bitand  ] replicate nip reverse ;
+    [ [ -7 shift ] keep 0x7f bitand  ] replicate nip reverse ;
 
 : filter-text-data ( data -- filtered )
     [ printable? ] filter ;
@@ -119,7 +119,7 @@ CONSTANT: id3v1+-length 227
 
 : decode-text ( string -- string' )
     dup 2 short head
-    { { HEX: ff HEX: fe } { HEX: fe HEX: ff } } member?
+    { { 0xff 0xfe } { 0xfe 0xff } } member?
     utf16 ascii ? decode ;
 
 : (read-frame) ( seq -- frame )
@@ -153,7 +153,7 @@ CONSTANT: id3v1+-length 227
     } cleave ;
 
 : merge-frames ( id3 assoc -- id3 )
-    [ dup frames>> ] dip update ;
+    [ dup frames>> ] dip assoc-union! drop ;
 
 : merge-id3v1 ( id3 -- id3 )
     dup id3v1>frames frames>assoc merge-frames ;