From 89e3eb6fa312ce7fd2ab777d8768fb9cd3e5ce2c Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Sun, 8 Feb 2009 23:49:05 -0600 Subject: [PATCH] Moving lists to basis --- basis/html/templates/chloe/compiler/compiler.factor | 2 +- basis/html/templates/fhtml/fhtml.factor | 2 +- {extra => basis}/lists/authors.txt | 0 {extra => basis}/lists/lazy/authors.txt | 0 {extra => basis}/lists/lazy/examples/authors.txt | 0 {extra => basis}/lists/lazy/examples/examples-tests.factor | 0 {extra => basis}/lists/lazy/examples/examples.factor | 0 {extra => basis}/lists/lazy/lazy-docs.factor | 0 {extra => basis}/lists/lazy/lazy-tests.factor | 0 {extra => basis}/lists/lazy/lazy.factor | 0 {extra => basis}/lists/lazy/old-doc.html | 0 {extra => basis}/lists/lazy/summary.txt | 0 {extra => basis}/lists/lazy/tags.txt | 0 {extra => basis}/lists/lists-docs.factor | 0 {extra => basis}/lists/lists-tests.factor | 0 {extra => basis}/lists/lists.factor | 0 {extra => basis}/lists/summary.txt | 0 {extra => basis}/lists/tags.txt | 0 18 files changed, 2 insertions(+), 2 deletions(-) rename {extra => basis}/lists/authors.txt (100%) rename {extra => basis}/lists/lazy/authors.txt (100%) rename {extra => basis}/lists/lazy/examples/authors.txt (100%) rename {extra => basis}/lists/lazy/examples/examples-tests.factor (100%) rename {extra => basis}/lists/lazy/examples/examples.factor (100%) rename {extra => basis}/lists/lazy/lazy-docs.factor (100%) rename {extra => basis}/lists/lazy/lazy-tests.factor (100%) rename {extra => basis}/lists/lazy/lazy.factor (100%) rename {extra => basis}/lists/lazy/old-doc.html (100%) rename {extra => basis}/lists/lazy/summary.txt (100%) rename {extra => basis}/lists/lazy/tags.txt (100%) rename {extra => basis}/lists/lists-docs.factor (100%) rename {extra => basis}/lists/lists-tests.factor (100%) rename {extra => basis}/lists/lists.factor (100%) rename {extra => basis}/lists/summary.txt (100%) rename {extra => basis}/lists/tags.txt (100%) diff --git a/basis/html/templates/chloe/compiler/compiler.factor b/basis/html/templates/chloe/compiler/compiler.factor index 1a1abc9f7b..3cb7523bdc 100644 --- a/basis/html/templates/chloe/compiler/compiler.factor +++ b/basis/html/templates/chloe/compiler/compiler.factor @@ -83,7 +83,7 @@ ERROR: unknown-chloe-tag tag ; : compile-chloe-tag ( tag -- ) dup main>> dup tags get at - [ curry call( -- ) ] + [ call( tag -- ) ] [ unknown-chloe-tag ] ?if ; diff --git a/basis/html/templates/fhtml/fhtml.factor b/basis/html/templates/fhtml/fhtml.factor index e76a812bef..78202d6460 100644 --- a/basis/html/templates/fhtml/fhtml.factor +++ b/basis/html/templates/fhtml/fhtml.factor @@ -72,6 +72,6 @@ TUPLE: fhtml path ; C: fhtml M: fhtml call-template* ( filename -- ) - '[ _ path>> utf8 file-contents eval-template ] call( -- ) ; + [ path>> utf8 file-contents eval-template ] call( filename -- ) ; INSTANCE: fhtml template diff --git a/extra/lists/authors.txt b/basis/lists/authors.txt similarity index 100% rename from extra/lists/authors.txt rename to basis/lists/authors.txt diff --git a/extra/lists/lazy/authors.txt b/basis/lists/lazy/authors.txt similarity index 100% rename from extra/lists/lazy/authors.txt rename to basis/lists/lazy/authors.txt diff --git a/extra/lists/lazy/examples/authors.txt b/basis/lists/lazy/examples/authors.txt similarity index 100% rename from extra/lists/lazy/examples/authors.txt rename to basis/lists/lazy/examples/authors.txt diff --git a/extra/lists/lazy/examples/examples-tests.factor b/basis/lists/lazy/examples/examples-tests.factor similarity index 100% rename from extra/lists/lazy/examples/examples-tests.factor rename to basis/lists/lazy/examples/examples-tests.factor diff --git a/extra/lists/lazy/examples/examples.factor b/basis/lists/lazy/examples/examples.factor similarity index 100% rename from extra/lists/lazy/examples/examples.factor rename to basis/lists/lazy/examples/examples.factor diff --git a/extra/lists/lazy/lazy-docs.factor b/basis/lists/lazy/lazy-docs.factor similarity index 100% rename from extra/lists/lazy/lazy-docs.factor rename to basis/lists/lazy/lazy-docs.factor diff --git a/extra/lists/lazy/lazy-tests.factor b/basis/lists/lazy/lazy-tests.factor similarity index 100% rename from extra/lists/lazy/lazy-tests.factor rename to basis/lists/lazy/lazy-tests.factor diff --git a/extra/lists/lazy/lazy.factor b/basis/lists/lazy/lazy.factor similarity index 100% rename from extra/lists/lazy/lazy.factor rename to basis/lists/lazy/lazy.factor diff --git a/extra/lists/lazy/old-doc.html b/basis/lists/lazy/old-doc.html similarity index 100% rename from extra/lists/lazy/old-doc.html rename to basis/lists/lazy/old-doc.html diff --git a/extra/lists/lazy/summary.txt b/basis/lists/lazy/summary.txt similarity index 100% rename from extra/lists/lazy/summary.txt rename to basis/lists/lazy/summary.txt diff --git a/extra/lists/lazy/tags.txt b/basis/lists/lazy/tags.txt similarity index 100% rename from extra/lists/lazy/tags.txt rename to basis/lists/lazy/tags.txt diff --git a/extra/lists/lists-docs.factor b/basis/lists/lists-docs.factor similarity index 100% rename from extra/lists/lists-docs.factor rename to basis/lists/lists-docs.factor diff --git a/extra/lists/lists-tests.factor b/basis/lists/lists-tests.factor similarity index 100% rename from extra/lists/lists-tests.factor rename to basis/lists/lists-tests.factor diff --git a/extra/lists/lists.factor b/basis/lists/lists.factor similarity index 100% rename from extra/lists/lists.factor rename to basis/lists/lists.factor diff --git a/extra/lists/summary.txt b/basis/lists/summary.txt similarity index 100% rename from extra/lists/summary.txt rename to basis/lists/summary.txt diff --git a/extra/lists/tags.txt b/basis/lists/tags.txt similarity index 100% rename from extra/lists/tags.txt rename to basis/lists/tags.txt