From 97dbf3260819bd311a02a141af6e7fc9abb6ed98 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Fri, 15 Feb 2008 20:34:04 -0600 Subject: [PATCH] Fixing FJSC and ID3 --- extra/fjsc/fjsc.factor | 4 ++-- extra/id3/id3.factor | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/extra/fjsc/fjsc.factor b/extra/fjsc/fjsc.factor index 6beb48e05e..ee6212ce98 100755 --- a/extra/fjsc/fjsc.factor +++ b/extra/fjsc/fjsc.factor @@ -39,7 +39,7 @@ C: ast-hashtable [ blank? not ] keep [ CHAR: } = not ] keep [ CHAR: ] = not ] keep - [ CHAR: ;" = not ] keep + [ CHAR: ; = not ] keep [ CHAR: " = not ] keep digit? not and and and and and ; @@ -48,7 +48,7 @@ MEMO: 'identifier-ends' ( -- parser ) [ [ blank? not ] keep [ CHAR: " = not ] keep - [ CHAR: ;" = not ] keep + [ CHAR: ; = not ] keep [ LETTER? not ] keep [ letter? not ] keep identifier-middle? not diff --git a/extra/id3/id3.factor b/extra/id3/id3.factor index 895efc59dc..2dcf0bf765 100644 --- a/extra/id3/id3.factor +++ b/extra/id3/id3.factor @@ -1,9 +1,8 @@ ! Copyright (C) 2007 Adam Wendt. ! See http://factorcode.org/license.txt for BSD license. -! USING: arrays combinators io io.binary io.files io.paths -io.utf16 kernel math math.parser namespaces sequences +io.encodings.utf16 kernel math math.parser namespaces sequences splitting strings assocs unicode.categories ; IN: id3