Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/extra/bake/bake.factor b/extra/bake/bake.factor
old mode 100755 (executable)
new mode 100644 (file)
index db77d92..748a811
--- a/extra/bake/bake.factor
+++ b/extra/bake/bake.factor
@@ -1,7 +1,7 @@
 
 USING: kernel parser namespaces sequences quotations arrays vectors splitting
-       words math
-       macros generalizations combinators.lib combinators.conditional newfx ;
+       strings words math generalizations
+       macros combinators.lib combinators.conditional newfx ;
 
 IN: bake
 
@@ -20,7 +20,9 @@ DEFER: [bake]
 : broil-element ( obj -- quot )
     {
       { [ comma?    ] [ drop [ >r ]          ] }
+      { [ f =       ] [ [ >r ] prefix-on     ] }
       { [ integer?  ] [ [ >r ] prefix-on     ] }
+      { [ string?   ] [ [ >r ] prefix-on     ] }
       { [ sequence? ] [ [bake] [ >r ] append ] }
       { [ word?     ] [ literalize [ >r ] prefix-on ] }
       { [ drop t    ] [ [ >r ] prefix-on     ] }
@@ -90,5 +92,6 @@ MACRO: bake ( seq -- quot ) [bake] ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: `{  \ } [ >array     ] parse-literal \ bake parsed ; parsing
+:  `{ \ } [ >array     ] parse-literal \ bake parsed ; parsing
 : `V{ \ } [ >vector    ] parse-literal \ bake parsed ; parsing
+:  `[ \ } [ >quotation ] parse-literal \ bake parsed ; parsing
\ No newline at end of file

diff --git a/extra/bake/fry/fry-tests.factor b/extra/bake/fry/fry-tests.factor
index 13202a78f51ad44276c5ce2188a1247e14a89c09..74408dc9f98cc5e6cd2a8cda6cf8fddf473d0261 100755 (executable)
--- a/extra/bake/fry/fry-tests.factor
+++ b/extra/bake/fry/fry-tests.factor
@@ -13,74 +13,74 @@ IN: bake.fry.tests
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-[ [ 3 + ] ] [ 3 `[ , + ] ] unit-test
+[ [ 3 + ] ] [ 3 '[ , + ] ] unit-test
 
-[ [ 1 3 + ] ] [ 1 3 `[ , , + ] ] unit-test
+[ [ 1 3 + ] ] [ 1 3 '[ , , + ] ] unit-test
 
-[ [ 1 + ] ] [ 1 [ + ] `[ , @ ] ] unit-test
+[ [ 1 + ] ] [ 1 [ + ] '[ , @ ] ] unit-test
 
-[ [ 1 + . ] ] [ 1 [ + ] `[ , @ . ] ] unit-test
+[ [ 1 + . ] ] [ 1 [ + ] '[ , @ . ] ] unit-test
 
-[ [ + - ] ] [ [ + ] [ - ] `[ @ @ ] ] unit-test
+[ [ + - ] ] [ [ + ] [ - ] '[ @ @ ] ] unit-test
 
 [ [ "a" write "b" print ] ]
-[ "a" "b" `[ , write , print ] ] unit-test
+[ "a" "b" '[ , write , print ] ] unit-test
 
 [ [ 1 2 + 3 4 - ] ]
-[ [ + ] [ - ] `[ 1 2 @ 3 4 @ ] ] unit-test
+[ [ + ] [ - ] '[ 1 2 @ 3 4 @ ] ] unit-test
 
 [ 1/2 ] [
-    1 `[ , _ / ] 2 swap call
+    1 '[ , _ / ] 2 swap call
 ] unit-test
 
 [ { { 1 "a" "A" } { 1 "b" "B" } { 1 "c" "C" } } ] [
-    1 `[ , _ _ 3array ]
+    1 '[ , _ _ 3array ]
     { "a" "b" "c" } { "A" "B" "C" } rot 2map
 ] unit-test
 
 [ { { 1 "a" } { 1 "b" } { 1 "c" } } ] [
-    `[ 1 _ 2array ]
+    '[ 1 _ 2array ]
     { "a" "b" "c" } swap map
 ] unit-test
 
 [ 1 2 ] [
-    1 2 `[ _ , ] call
+    1 2 '[ _ , ] call
 ] unit-test
 
 [ { { 1 "a" 2 } { 1 "b" 2 } { 1 "c" 2 } } ] [
-    1 2 `[ , _ , 3array ]
+    1 2 '[ , _ , 3array ]
     { "a" "b" "c" } swap map
 ] unit-test
 
-: funny-dip `[ @ _ ] call ; inline
+: funny-dip '[ @ _ ] call ; inline
 
 [ "hi" 3 ] [ "h" "i" 3 [ append ] funny-dip ] unit-test
 
 [ { 1 2 3 } ] [
-    3 1 `[ , [ , + ] map ] call
+    3 1 '[ , [ , + ] map ] call
 ] unit-test
 
 [ { 1 { 2 { 3 } } } ] [
-    1 2 3 `[ , [ , [ , 1array ] call 2array ] call 2array ] call
+    1 2 3 '[ , [ , [ , 1array ] call 2array ] call 2array ] call
 ] unit-test
 
-{ 1 1 } [ `[ [ [ , ] ] ] ] must-infer-as
+{ 1 1 } [ '[ [ [ , ] ] ] ] must-infer-as
 
 [ { { { 3 } } } ] [
-    3 `[ [ [ , 1array ] call 1array ] call 1array ] call
+    3 '[ [ [ , 1array ] call 1array ] call 1array ] call
 ] unit-test
 
 [ { { { 3 } } } ] [
-    3 `[ [ [ , 1array ] call 1array ] call 1array ] call
+    3 '[ [ [ , 1array ] call 1array ] call 1array ] call
 ] unit-test
 
-! [ 10 20 30 40 `[ , V{ , { , } } , ] ] [ [ 10 V{ 20 { 30 } } 40 ] ] unit-test*
+! [ 10 20 30 40 '[ , V{ , { , } } , ] ] [ [ 10 V{ 20 { 30 } } 40 ] ] unit-test*
 
-[ 10 20 30 40 `[ , V{ , { , } } , ] ]
+[ 10 20 30 40 '[ , V{ , { , } } , ] ]
 [ [ 10 20 30 >r r> 1 narray >r >r r> r> 2 narray >vector 40 ] ]
 unit-test*
 
-[ { 1 2 3 } { 4 5 6 } { 7 8 9 } `[ , { V{ @ } { , } } ] call ]
+[ { 1 2 3 } { 4 5 6 } { 7 8 9 } '[ , { V{ @ } { , } } ] call ]
 [
   { 1 2 3 }
   { V{ 4 5 6 } { { 7 8 9 } } }

diff --git a/extra/bake/fry/fry.factor b/extra/bake/fry/fry.factor
index 6b069334e65a227d1cd0a5fc5e626433f32b23e5..b9f9882e88d935b4cd00480c0b64a3777b6cc06c 100644 (file)
--- a/extra/bake/fry/fry.factor
+++ b/extra/bake/fry/fry.factor
@@ -77,4 +77,4 @@ DEFER: shallow-fry
 
 MACRO: fry ( seq -- quot ) [fry] ;
 
-: `[ \ ] [ >quotation ] parse-literal \ fry parsed ; parsing
\ No newline at end of file
+: '[ \ ] [ >quotation ] parse-literal \ fry parsed ; parsing
\ No newline at end of file

diff --git a/extra/documents/documents.factor b/extra/documents/documents.factor
index 9e4802c2ef02242e95b1af7eb6eb2417142d7464..d046102ec96119f9e3b51386e776142a84c20b34 100755 (executable)
--- a/extra/documents/documents.factor
+++ b/extra/documents/documents.factor
@@ -15,11 +15,11 @@ IN: documents
 
 : lines-equal? ( loc1 loc2 -- ? ) [ first ] bi@ number= ;
 
-TUPLE: document locs ;
+TUPLE: document < model locs ;
 
 : <document> ( -- document )
-    V{ "" } clone <model> V{ } clone
-    { set-delegate set-document-locs } document construct ;
+    V{ "" } clone document new-model
+    V{ } clone >>locs ;
 
 : add-loc ( loc document -- ) locs>> push ;