Merging Diego Martinelli's improvements and simplifications of morse
parent
c2a35ecf33
commit
0f82f4af87
|
@ -1 +1,2 @@
|
|||
Alex Chapman
|
||||
Diego Martinelli
|
||||
|
|
|
@ -6,12 +6,12 @@ IN: morse
|
|||
HELP: ch>morse
|
||||
{ $values
|
||||
{ "ch" "A character that has a morse code translation" } { "str" "A string consisting of zero or more dots and dashes" } }
|
||||
{ $description "If the given character has a morse code translation, then return that translation, otherwise return an empty string." } ;
|
||||
{ $description "If the given character has a morse code translation, then return that translation, otherwise return a ? character." } ;
|
||||
|
||||
HELP: morse>ch
|
||||
{ $values
|
||||
{ "str" "A string of dots and dashes that represents a single character in morse code" } { "ch" "The translated character" } }
|
||||
{ $description "If the given string represents a morse code character, then return that character, otherwise return f" } ;
|
||||
{ $description "If the given string represents a morse code character, then return that character, otherwise return a space character." } ;
|
||||
|
||||
HELP: >morse
|
||||
{ $values
|
||||
|
|
|
@ -1,13 +1,43 @@
|
|||
! Copyright (C) 2007 Alex Chapman
|
||||
! See http://factorcode.org/license.txt for BSD license.
|
||||
USING: arrays morse strings tools.test ;
|
||||
IN: morse.tests
|
||||
|
||||
[ "" ] [ CHAR: \\ ch>morse ] unit-test
|
||||
[ CHAR: ? ] [ CHAR: \\ ch>morse ] unit-test
|
||||
[ "..." ] [ CHAR: s ch>morse ] unit-test
|
||||
[ CHAR: s ] [ "..." morse>ch ] unit-test
|
||||
[ f ] [ "..--..--.." morse>ch ] unit-test
|
||||
[ CHAR: \s ] [ "..--..--.." morse>ch ] unit-test
|
||||
[ "-- --- .-. ... . / -.-. --- -.. ." ] [ "morse code" >morse ] unit-test
|
||||
[ "morse code" ] [ "-- --- .-. ... . / -.-. --- -.. ." morse> ] unit-test
|
||||
[ "hello, world!" ] [ "Hello, World!" >morse morse> ] unit-test
|
||||
[ ".- -... -.-." ] [ "abc" >morse ] unit-test
|
||||
|
||||
[ "abc" ] [ ".- -... -.-." morse> ] unit-test
|
||||
|
||||
[ "morse code" ] [
|
||||
[MORSE
|
||||
-- --- .-. ... . /
|
||||
-.-. --- -.. .
|
||||
MORSE] >morse morse> ] unit-test
|
||||
|
||||
[ "morse code 123" ] [
|
||||
[MORSE
|
||||
__ ___ ._. ... . /
|
||||
_._. ___ _.. . /
|
||||
.____ ..___ ...__
|
||||
MORSE] ] unit-test
|
||||
|
||||
[ [MORSE
|
||||
-- --- .-. ... . /
|
||||
-.-. --- -.. .
|
||||
MORSE] ] [
|
||||
"morse code" >morse morse>
|
||||
] unit-test
|
||||
|
||||
[ "factor rocks!" ] [
|
||||
[MORSE
|
||||
..-. .- -.-. - --- .-. /
|
||||
.-. --- -.-. -.- ... -.-.--
|
||||
MORSE] ] unit-test
|
||||
! [ ] [ "sos" 0.075 play-as-morse* ] unit-test
|
||||
! [ ] [ "Factor rocks!" play-as-morse ] unit-test
|
||||
|
|
|
@ -1,13 +1,22 @@
|
|||
! Copyright (C) 2007, 2008 Alex Chapman
|
||||
! Copyright (C) 2007, 2008, 2009 Alex Chapman, 2009 Diego Martinelli
|
||||
! See http://factorcode.org/license.txt for BSD license.
|
||||
USING: accessors ascii assocs combinators hashtables kernel lists math
|
||||
namespaces make openal parser-combinators promises sequences
|
||||
strings synth synth.buffers unicode.case ;
|
||||
USING: accessors ascii assocs biassocs combinators hashtables kernel lists math
|
||||
namespaces make multiline openal parser sequences splitting strings synth synth.buffers ;
|
||||
IN: morse
|
||||
|
||||
<PRIVATE
|
||||
: morse-codes ( -- array )
|
||||
{
|
||||
|
||||
CONSTANT: dot-char CHAR: .
|
||||
CONSTANT: dash-char CHAR: -
|
||||
CONSTANT: char-gap-char CHAR: \s
|
||||
CONSTANT: word-gap-char CHAR: /
|
||||
CONSTANT: unknown-char CHAR: ?
|
||||
|
||||
PRIVATE>
|
||||
|
||||
DEFER: morse-code-table
|
||||
|
||||
H{
|
||||
{ CHAR: a ".-" }
|
||||
{ CHAR: b "-..." }
|
||||
{ CHAR: c "-.-." }
|
||||
|
@ -63,68 +72,49 @@ IN: morse
|
|||
{ CHAR: $ "...-..-" }
|
||||
{ CHAR: @ ".--.-." }
|
||||
{ CHAR: \s "/" }
|
||||
} ;
|
||||
} >biassoc \ morse-code-table set-global
|
||||
|
||||
: ch>morse-assoc ( -- assoc )
|
||||
morse-codes >hashtable ;
|
||||
: morse-code-table ( -- biassoc )
|
||||
\ morse-code-table get-global ;
|
||||
|
||||
: morse>ch-assoc ( -- assoc )
|
||||
morse-codes [ reverse ] map >hashtable ;
|
||||
|
||||
PRIVATE>
|
||||
|
||||
: ch>morse ( ch -- str )
|
||||
ch>lower ch>morse-assoc at* swap "" ? ;
|
||||
: ch>morse ( ch -- morse )
|
||||
ch>lower morse-code-table at [ unknown-char ] unless* ;
|
||||
|
||||
: morse>ch ( str -- ch )
|
||||
morse>ch-assoc at* swap f ? ;
|
||||
|
||||
: >morse ( str -- str )
|
||||
[
|
||||
[ CHAR: \s , ] [ ch>morse % ] interleave
|
||||
] "" make ;
|
||||
morse-code-table value-at [ char-gap-char ] unless* ;
|
||||
|
||||
<PRIVATE
|
||||
|
||||
: dot-char ( -- ch ) CHAR: . ;
|
||||
: dash-char ( -- ch ) CHAR: - ;
|
||||
: char-gap-char ( -- ch ) CHAR: \s ;
|
||||
: word-gap-char ( -- ch ) CHAR: / ;
|
||||
: word>morse ( str -- morse )
|
||||
[ ch>morse ] { } map-as " " join ;
|
||||
|
||||
: =parser ( obj -- parser )
|
||||
[ = ] curry satisfy ;
|
||||
: sentence>morse ( str -- morse )
|
||||
" " split [ word>morse ] map " / " join ;
|
||||
|
||||
LAZY: 'dot' ( -- parser )
|
||||
dot-char =parser ;
|
||||
: trim-blanks ( str -- newstr )
|
||||
[ blank? ] trim ; inline
|
||||
|
||||
LAZY: 'dash' ( -- parser )
|
||||
dash-char =parser ;
|
||||
: morse>word ( morse -- str )
|
||||
" " split [ morse>ch ] "" map-as ;
|
||||
|
||||
LAZY: 'char-gap' ( -- parser )
|
||||
char-gap-char =parser ;
|
||||
: morse>sentence ( morse -- sentence )
|
||||
"/" split [ trim-blanks morse>word ] map " " join ;
|
||||
|
||||
LAZY: 'word-gap' ( -- parser )
|
||||
word-gap-char =parser ;
|
||||
|
||||
LAZY: 'morse-char' ( -- parser )
|
||||
'dot' 'dash' <|> <+> ;
|
||||
|
||||
LAZY: 'morse-word' ( -- parser )
|
||||
'morse-char' 'char-gap' list-of ;
|
||||
|
||||
LAZY: 'morse-words' ( -- parser )
|
||||
'morse-word' 'word-gap' list-of ;
|
||||
: replace-underscores ( str -- str' )
|
||||
[ dup CHAR: _ = [ drop CHAR: - ] when ] map ;
|
||||
|
||||
PRIVATE>
|
||||
|
||||
: morse> ( str -- str )
|
||||
'morse-words' parse car parsed>> [
|
||||
[
|
||||
>string morse>ch
|
||||
] map >string
|
||||
] map [ [ CHAR: \s , ] [ % ] interleave ] "" make ;
|
||||
: >morse ( str -- newstr )
|
||||
trim-blanks sentence>morse ;
|
||||
|
||||
: morse> ( morse -- plain )
|
||||
replace-underscores morse>sentence ;
|
||||
|
||||
SYNTAX: [MORSE "MORSE]" parse-multiline-string morse> parsed ;
|
||||
|
||||
<PRIVATE
|
||||
|
||||
SYMBOLS: source dot-buffer dash-buffer intra-char-gap-buffer letter-gap-buffer ;
|
||||
|
||||
: queue ( symbol -- )
|
||||
|
@ -135,7 +125,7 @@ SYMBOLS: source dot-buffer dash-buffer intra-char-gap-buffer letter-gap-buffer ;
|
|||
: intra-char-gap ( -- ) intra-char-gap-buffer queue ;
|
||||
: letter-gap ( -- ) letter-gap-buffer queue ;
|
||||
|
||||
: beep-freq ( -- n ) 880 ;
|
||||
CONSTANT: beep-freq 880
|
||||
|
||||
: <morse-buffer> ( -- buffer )
|
||||
half-sample-freq <8bit-mono-buffer> ;
|
||||
|
|
Loading…
Reference in New Issue