From 7f983f12d46ac9bafc82c089699d46cde6a56aa0 Mon Sep 17 00:00:00 2001
From: Doug Coleman <erg@jobim.local>
Date: Wed, 22 Apr 2009 12:26:28 -0500
Subject: [PATCH 1/3] fix help lint failures, fix example in words
---
basis/compiler/tree/builder/builder-docs.factor | 4 ++--
basis/tools/crossref/crossref-docs.factor | 4 ++--
core/words/words-docs.factor | 6 ++++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/basis/compiler/tree/builder/builder-docs.factor b/basis/compiler/tree/builder/builder-docs.factor
index 3fa576faf5..b7ee51834b 100644
--- a/basis/compiler/tree/builder/builder-docs.factor
+++ b/basis/compiler/tree/builder/builder-docs.factor
@@ -3,11 +3,11 @@ compiler.tree stack-checker.errors ;
IN: compiler.tree.builder
HELP: build-tree
-{ $values { "quot/word" { $or quotation word } } { "nodes" "a sequence of nodes" } }
+{ $values { "word/quot" { $or word quotation } } { "nodes" "a sequence of nodes" } }
{ $description "Attempts to construct tree SSA IR from a quotation." }
{ $notes "This is the first stage of the compiler." }
{ $errors "Throws an " { $link inference-error } " if stack effect inference fails." } ;
HELP: build-sub-tree
-{ $values { "#call" #call } { "quot/word" { $or quotation word } } { "nodes" { $maybe "a sequence of nodes" } } }
+{ $values { "#call" #call } { "word/quot" { $or word quotation } } { "nodes/f" { $maybe "a sequence of nodes" } } }
{ $description "Attempts to construct tree SSA IR from a quotation, starting with an initial data stack of values from the call site. Outputs " { $link f } " if stack effect inference fails." } ;
diff --git a/basis/tools/crossref/crossref-docs.factor b/basis/tools/crossref/crossref-docs.factor
index 99d1257f31..9108777554 100644
--- a/basis/tools/crossref/crossref-docs.factor
+++ b/basis/tools/crossref/crossref-docs.factor
@@ -1,5 +1,5 @@
USING: help.markup help.syntax words definitions prettyprint
-tools.crossref.private math quotations assocs ;
+tools.crossref.private math quotations assocs kernel ;
IN: tools.crossref
ARTICLE: "tools.crossref" "Definition cross referencing"
@@ -51,7 +51,7 @@ HELP: usage.
{ $examples { $code "\\ reverse usage." } } ;
HELP: quot-uses
-{ $values { "quot" quotation } { "assoc" "an assoc with words as keys" } }
+{ $values { "obj" object } { "assoc" "an assoc with words as keys" } }
{ $description "Outputs a set of words referenced by the quotation and any quotations it contains." } ;
{ usage usage. } related-words
diff --git a/core/words/words-docs.factor b/core/words/words-docs.factor
index c1b8c0c229..58cc3c4f49 100644
--- a/core/words/words-docs.factor
+++ b/core/words/words-docs.factor
@@ -160,11 +160,13 @@ ABOUT: "words"
HELP: execute ( word -- )
{ $values { "word" word } }
-{ $description "Executes a word." }
+{ $description "Executes a word. Words which call execute must be inlined in order to compile when called from other words." }
{ $examples
- { $example "USING: kernel io words ;" "IN: scratchpad" ": twice ( word -- ) dup execute execute ;\n: hello ( -- ) \"Hello\" print ;\n\\ hello twice" "Hello\nHello" }
+ { $example "USING: kernel io words ;" "IN: scratchpad" ": twice ( word -- ) dup execute execute ; inline\n: hello ( -- ) \"Hello\" print ;\n\\ hello twice" "Hello\nHello" }
} ;
+{ execute POSTPONE: execute( } related-words
+
HELP: deferred
{ $class-description "The class of deferred words created by " { $link POSTPONE: DEFER: } "." } ;
From 553de434bb4e17a7f6750eb6cfd10c3f52391be8 Mon Sep 17 00:00:00 2001
From: Maxim Savchenko <pdunan@gmail.com>
Date: Wed, 22 Apr 2009 16:39:28 -0400
Subject: [PATCH 2/3] Cleaning out newfx references
---
unmaintained/dns/dns.factor | 30 +++++++++++++++---------------
unmaintained/dns/misc/misc.factor | 6 +++---
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/unmaintained/dns/dns.factor b/unmaintained/dns/dns.factor
index cf98154e7a..6d81f2a14b 100644
--- a/unmaintained/dns/dns.factor
+++ b/unmaintained/dns/dns.factor
@@ -6,7 +6,7 @@ USING: kernel byte-arrays combinators strings arrays sequences splitting
io io.binary io.sockets io.encodings.binary
accessors
combinators.smart
- newfx
+ assocs
;
IN: dns
@@ -148,8 +148,8 @@ SYMBOLS: NO-ERROR FORMAT-ERROR SERVER-FAILURE NAME-ERROR NOT-IMPLEMENTED
[
{
[ name>> dn->ba ]
- [ type>> type-table of uint16->ba ]
- [ class>> class-table of uint16->ba ]
+ [ type>> type-table at uint16->ba ]
+ [ class>> class-table at uint16->ba ]
} cleave
] output>array concat ;
@@ -203,8 +203,8 @@ SYMBOLS: NO-ERROR FORMAT-ERROR SERVER-FAILURE NAME-ERROR NOT-IMPLEMENTED
[
{
[ name>> dn->ba ]
- [ type>> type-table of uint16->ba ]
- [ class>> class-table of uint16->ba ]
+ [ type>> type-table at uint16->ba ]
+ [ class>> class-table at uint16->ba ]
[ ttl>> uint32->ba ]
[
[ type>> ] [ rdata>> ] bi rdata->ba
@@ -219,13 +219,13 @@ SYMBOLS: NO-ERROR FORMAT-ERROR SERVER-FAILURE NAME-ERROR NOT-IMPLEMENTED
[
{
[ qr>> 15 shift ]
- [ opcode>> opcode-table of 11 shift ]
+ [ opcode>> opcode-table at 11 shift ]
[ aa>> 10 shift ]
[ tc>> 9 shift ]
[ rd>> 8 shift ]
[ ra>> 7 shift ]
[ z>> 4 shift ]
- [ rcode>> rcode-table of 0 shift ]
+ [ rcode>> rcode-table at 0 shift ]
} cleave
] sum-outputs uint16->ba ;
@@ -301,8 +301,8 @@ SYMBOLS: NO-ERROR FORMAT-ERROR SERVER-FAILURE NAME-ERROR NOT-IMPLEMENTED
[ get-name ]
[
skip-name
- [ 0 + get-double type-table key-of ]
- [ 2 + get-double class-table key-of ]
+ [ 0 + get-double type-table value-at ]
+ [ 2 + get-double class-table value-at ]
2bi
]
2bi query boa ;
@@ -364,10 +364,10 @@ SYMBOLS: NO-ERROR FORMAT-ERROR SERVER-FAILURE NAME-ERROR NOT-IMPLEMENTED
[
skip-name
{
- [ 0 + get-double type-table key-of ]
- [ 2 + get-double class-table key-of ]
+ [ 0 + get-double type-table value-at ]
+ [ 2 + get-double class-table value-at ]
[ 4 + get-quad ]
- [ [ 10 + ] [ get-double type-table key-of ] 2bi get-rdata ]
+ [ [ 10 + ] [ get-double type-table value-at ] 2bi get-rdata ]
}
2cleave
]
@@ -393,13 +393,13 @@ SYMBOLS: NO-ERROR FORMAT-ERROR SERVER-FAILURE NAME-ERROR NOT-IMPLEMENTED
get-double
{
[ 15 >> BIN: 1 bitand ]
- [ 11 >> BIN: 111 bitand opcode-table key-of ]
+ [ 11 >> BIN: 111 bitand opcode-table value-at ]
[ 10 >> BIN: 1 bitand ]
[ 9 >> BIN: 1 bitand ]
[ 8 >> BIN: 1 bitand ]
[ 7 >> BIN: 1 bitand ]
[ 4 >> BIN: 111 bitand ]
- [ BIN: 1111 bitand rcode-table key-of ]
+ [ BIN: 1111 bitand rcode-table value-at ]
}
cleave ;
@@ -484,7 +484,7 @@ SYMBOLS: NO-ERROR FORMAT-ERROR SERVER-FAILURE NAME-ERROR NOT-IMPLEMENTED
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-: message-query ( message -- query ) question-section>> 1st ;
+: message-query ( message -- query ) question-section>> first ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/unmaintained/dns/misc/misc.factor b/unmaintained/dns/misc/misc.factor
index 6e62513a80..af080f61eb 100644
--- a/unmaintained/dns/misc/misc.factor
+++ b/unmaintained/dns/misc/misc.factor
@@ -1,6 +1,6 @@
USING: kernel combinators sequences splitting math
- io.files io.encodings.utf8 random newfx dns.util ;
+ io.files io.encodings.utf8 random dns.util ;
IN: dns.misc
@@ -9,8 +9,8 @@ IN: dns.misc
: resolv-conf-servers ( -- seq )
"/etc/resolv.conf" utf8 file-lines
[ " " split ] map
- [ 1st "nameserver" = ] filter
- [ 2nd ] map ;
+ [ first "nameserver" = ] filter
+ [ second ] map ;
: resolv-conf-server ( -- ip ) resolv-conf-servers random ;
From 47fb13955c7e49c2ae2adaa38daed06c7c9b9c57 Mon Sep 17 00:00:00 2001
From: Doug Coleman <erg@jobim.local>
Date: Wed, 22 Apr 2009 16:18:15 -0500
Subject: [PATCH 3/3] move dns from unmaintained to extra for keyholder
---
{unmaintained => extra}/dns/cache/nx/nx.factor | 0
{unmaintained => extra}/dns/cache/rr/rr.factor | 0
{unmaintained => extra}/dns/dns.factor | 0
{unmaintained => extra}/dns/forwarding/forwarding.factor | 0
{unmaintained => extra}/dns/misc/misc.factor | 0
{unmaintained => extra}/dns/resolver/resolver.factor | 0
{unmaintained => extra}/dns/server/server.factor | 6 +++---
{unmaintained => extra}/dns/stub/stub.factor | 0
{unmaintained => extra}/dns/util/util.factor | 0
9 files changed, 3 insertions(+), 3 deletions(-)
rename {unmaintained => extra}/dns/cache/nx/nx.factor (100%)
rename {unmaintained => extra}/dns/cache/rr/rr.factor (100%)
rename {unmaintained => extra}/dns/dns.factor (100%)
rename {unmaintained => extra}/dns/forwarding/forwarding.factor (100%)
rename {unmaintained => extra}/dns/misc/misc.factor (100%)
rename {unmaintained => extra}/dns/resolver/resolver.factor (100%)
rename {unmaintained => extra}/dns/server/server.factor (97%)
rename {unmaintained => extra}/dns/stub/stub.factor (100%)
rename {unmaintained => extra}/dns/util/util.factor (100%)
diff --git a/unmaintained/dns/cache/nx/nx.factor b/extra/dns/cache/nx/nx.factor
similarity index 100%
rename from unmaintained/dns/cache/nx/nx.factor
rename to extra/dns/cache/nx/nx.factor
diff --git a/unmaintained/dns/cache/rr/rr.factor b/extra/dns/cache/rr/rr.factor
similarity index 100%
rename from unmaintained/dns/cache/rr/rr.factor
rename to extra/dns/cache/rr/rr.factor
diff --git a/unmaintained/dns/dns.factor b/extra/dns/dns.factor
similarity index 100%
rename from unmaintained/dns/dns.factor
rename to extra/dns/dns.factor
diff --git a/unmaintained/dns/forwarding/forwarding.factor b/extra/dns/forwarding/forwarding.factor
similarity index 100%
rename from unmaintained/dns/forwarding/forwarding.factor
rename to extra/dns/forwarding/forwarding.factor
diff --git a/unmaintained/dns/misc/misc.factor b/extra/dns/misc/misc.factor
similarity index 100%
rename from unmaintained/dns/misc/misc.factor
rename to extra/dns/misc/misc.factor
diff --git a/unmaintained/dns/resolver/resolver.factor b/extra/dns/resolver/resolver.factor
similarity index 100%
rename from unmaintained/dns/resolver/resolver.factor
rename to extra/dns/resolver/resolver.factor
diff --git a/unmaintained/dns/server/server.factor b/extra/dns/server/server.factor
similarity index 97%
rename from unmaintained/dns/server/server.factor
rename to extra/dns/server/server.factor
index b14d765e8d..644533d3a2 100644
--- a/unmaintained/dns/server/server.factor
+++ b/extra/dns/server/server.factor
@@ -2,7 +2,7 @@
USING: kernel combinators sequences sets math threads namespaces continuations
debugger io io.sockets unicode.case accessors destructors
combinators.short-circuit combinators.smart
- newfx fry arrays
+ fry arrays
dns dns.util dns.misc ;
IN: dns.server
@@ -64,7 +64,7 @@ SYMBOL: records-var
[ rr->rdata-names ] map concat ;
: extract-names ( message -- names )
- [ message-query name>> ] [ extract-rdata-names ] bi prefix-on ;
+ [ message-query name>> ] [ extract-rdata-names ] bi swap prefix ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! fill-authority
@@ -99,7 +99,7 @@ DEFER: query->rrs
: matching-cname? ( query -- rrs/f )
[ ] [ clone CNAME >>type matching-rrs ] bi ! query rrs
[ empty? not ]
- [ 1st swap clone over rdata>> >>name query->rrs prefix-on ]
+ [ first swap clone over rdata>> >>name query->rrs swap prefix ]
[ 2drop f ]
1if ;
diff --git a/unmaintained/dns/stub/stub.factor b/extra/dns/stub/stub.factor
similarity index 100%
rename from unmaintained/dns/stub/stub.factor
rename to extra/dns/stub/stub.factor
diff --git a/unmaintained/dns/util/util.factor b/extra/dns/util/util.factor
similarity index 100%
rename from unmaintained/dns/util/util.factor
rename to extra/dns/util/util.factor