steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

factor: fix more libs.

locals-and-roots
Doug Coleman 2016-06-05 18:13:21 -07:00
parent 534433b44d
commit 487193cb26
8 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/twitter/prettyprint/prettyprint.factor
View File

@ -12,24 +12,24 @@ MEMO: load-http-image ( url -- image/f )
profile-image-url>> load-http-image ;
CONSTANT: tweet-table-style
H{ { table-gap { 5 5 } } }
H{ { table-gap { 5 5 } } } ;
CONSTANT: tweet-username-style
H{
{ font-style bold }
}
} ;
CONSTANT: tweet-text-style
H{
{ font-name "sans-serif" }
{ font-size 16 }
{ wrap-margin 500 }
}
} ;
CONSTANT: tweet-metadata-style
H{
{ font-size 10 }
}
} ;
: profile. ( user -- )
tweet-table-style [

2
libs/xml/autoencoding/autoencoding.factor
View File

@ -53,7 +53,7 @@ in: xml.autoencoding
get-next {
{ 0 [ next next start-utf16le ] }
{ char: ? [ go-utf8 instruct dup instruct-encoding ] }
{ char: ! [ go-utf8 direct ] }
{ char: \! [ go-utf8 direct ] }
[ check start<name ]
} case ;

2
libs/xml/dtd/dtd.factor
View File

@ -24,7 +24,7 @@ UNION: dtd-acceptable
[
take-word pass-blank get-char {
{ char: ' [ parse-quote ] }
{ char: " [ parse-quote ] }
{ char: \" [ parse-quote ] }
[ drop take-external-id close ]
} case
] dip '[ swap _ [ ?set-at ] change ] 2keep ;

6
libs/xml/elements/elements.factor
View File

@ -132,7 +132,7 @@ defer: make-tag ! Is this unavoidable?
[ take-external-id ] [ f ] if ;
: take-internal ( -- dtd/f )
get-char char: [ eq?
get-char char: \[ eq?
[ next take-internal-subset ] [ f ] if ;
: take-doctype-decl ( -- doctype-decl )
@ -152,7 +152,7 @@ defer: make-tag ! Is this unavoidable?
: direct ( -- object )
get-char {
{ char: - [ take-comment ] }
{ char: [ [ take-cdata ] }
{ char: \[ [ take-cdata ] }
[ drop take-directive ]
} case ;
@ -166,7 +166,7 @@ defer: make-tag ! Is this unavoidable?
: make-tag ( -- tag )
get-char {
{ char: ! [ next direct ] }
{ char: \! [ next direct ] }
{ char: ? [ next instruct ] }
{ char: - [ next interpolate-tag ] }
[ drop normal-tag ]

4
libs/xml/entities/entities.factor
View File

@ -15,7 +15,7 @@ CONSTANT: quoted-entities-out
H{
{ char: & "&amp;" }
{ char: ' "&apos;" }
{ char: " "&quot;" }
{ char: \" "&quot;" }
{ char: < "&lt;" }
} ;
@ -35,7 +35,7 @@ CONSTANT: entities
{ "gt" char: > }
{ "amp" char: & }
{ "apos" char: ' }
{ "quot" char: " }
{ "quot" char: \" }
} ;
: with-entities ( entities quot -- )

4
libs/xml/name/name.factor
View File

@ -65,8 +65,8 @@ symbol: ns-stack
} 2&& [ f <name> ] [ 2drop f ] if ;
: prefixed-name ( str -- name/f )
char: : over index [
char: : 2over 1 + swap index-from
char: \: over index [
char: \: 2over 1 + swap index-from
[ 2drop f ]
[ [ head ] [ 1 + tail ] 2bi maybe-name ]
if

2
libs/yaml/conversion/conversion.factor
View File

@ -111,7 +111,7 @@ CONSTANT: YAML_SET_TAG "tag:yaml.org,2002:set" ;
R/ -[0-9][^0-9]/ [ [ char: 0 1 ] dip insert-nth ] re-replace-with
R/ [^0-9][0-9]:/ [ [ char: 0 1 ] dip insert-nth ] re-replace-with
R/ [ \t]+/ " " re-replace
char: : over index cut char: space swap remove append ;
char: \: over index cut char: space swap remove append ;
: construct-timestamp ( obj -- obj' )
dup R/ [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ matches?

64
modern-transition.factor
View File

@ -3,31 +3,6 @@
! find . -type f -name '*.factor' -exec sed -i '' 's/\(^CALLBACK:.* (.*)\)/\1 ;/g' {} +
! lexable-core-paths [ dup . flush path>literals ] map-zip
"resource:ffi" vocabs-from
{ "x11.syntax" "windows.com.syntax" "python.syntax" "opengl.gl.extensions"
"opencl.syntax" "mongodb.tuple" "cuda.syntax" "core-foundation.strings"
"cocoa.subclassing" "cocoa" "cocoa.apple-script" "gobject-introspection" } diff
[ dup <vocab-link> . flush vocab>literals ] map-zip
"resource:tools" vocabs-from
{ "help.syntax" "help.tips" "tools.test" "tools.walker"
"vocabs.git" } diff
[ dup <vocab-link> . flush vocab>literals ] map-zip
"resource:collections" vocabs-from
{ "bit-arrays"
"bit-vectors" "dlists" "linked-assocs" "nibble-arrays"
"specialized-arrays" "specialized-vectors" "suffix-arrays"
"trees" "vlists" "arrays.shaped" "byte-arrays.hex"
"hash-sets.identity" "hash-sets.numbers" "hash-sets.sequences"
"hashtables.numbers" "hashtables.sequences" "persistent.hashtables"
"memory.pools" "persistent.vectors" "trees.avl" "trees.splay"
} diff
[ dup <vocab-link> . flush vocab>literals ] map-zip
"resource:language" vocabs-from
{ "constructors" "descriptive" "eval" "functors" "literals"
"match" "method-chains" "multi-methods" "multiline"
@ -42,12 +17,51 @@
} diff
[ dup <vocab-link> . flush vocab>literals ] map-zip
"resource:collections" vocabs-from
{ "bit-arrays"
"bit-vectors" "dlists" "linked-assocs" "nibble-arrays"
"specialized-arrays" "specialized-vectors" "suffix-arrays"
"trees" "vlists" "arrays.shaped" "byte-arrays.hex"
"hash-sets.identity" "hash-sets.numbers" "hash-sets.sequences"
"hashtables.numbers" "hashtables.sequences" "persistent.hashtables"
"memory.pools" "persistent.vectors" "trees.avl" "trees.splay"
} diff
[ dup <vocab-link> . flush vocab>literals ] map-zip
"resource:ffi" vocabs-from
{ "x11.syntax" "windows.com.syntax" "python.syntax" "opengl.gl.extensions"
"opencl.syntax" "mongodb.tuple" "cuda.syntax" "core-foundation.strings"
"cocoa.subclassing" "cocoa" "cocoa.apple-script" "gobject-introspection" } diff
[ dup <vocab-link> . flush vocab>literals ] map-zip
"resource:libs" vocabs-from
{ "annotations" "brainfuck" "dice" "infix" "logging"
"metar" "money" "poker" "qw" "roles" "roman" "slides"
"svg" "urls" "xkcd" "calendar.holidays"
"calendar.holidays.canada" "calendar.holidays.us"
"colors.constants" "colors.hex" "gml.macros"
"gml.parser" "gml.runtime" "html.templates.chloe.syntax"
"infix.tokenizer" "irc.messages.base"
"math.complex" "math.rectangles" "math.blas.matrices"
"math.blas.vectors" "math.derivatives.syntax"
"math.vectors.simd" "math.vectors.simd.cords" "peg.pl0"
"peg.javascript.parser" "peg.javascript.tokenizer"
"unicode.categories" "units.reduction" "xml.errors"
"xml.syntax" "xmode.loader.syntax" "yaml.conversion"
} diff
[ dup <vocab-link> . flush vocab>literals ] map-zip
"resource:frameworks" vocabs-from
{ "ui.theme.switching" "ui.backend.cocoa.views" "ui.backend.cocoa.tools"
"ui.backend.gtk" "ui.backend.cocoa" "gpu.demos.raytrace" "gpu.demos.bunny"
"gpu.shaders" "gpu.render" "game.worlds" "ui" "db.postgresql.errors" } diff
[ dup <vocab-link> . flush vocab>literals ] map-zip
"resource:tools" vocabs-from
{ "help.syntax" "help.tips" "tools.test" "tools.walker"
"vocabs.git" } diff
[ dup <vocab-link> . flush vocab>literals ] map-zip
"resource:demos" vocabs-from
{ "talks.vpri-talk" "talks.tc-lisp-talk" "talks.minneapolis-talk" "talks.google-tech-talk"
"talks.galois-talk" "talks.otug-talk" "smalltalk.selectors" "smalltalk.parser"