nested-comments: remove this vocab. we have /* */ which is good enough for now.

broken case:
(*
: print-broken ( -- ) "*)" ;
*)

not worth fixing, please don't bring this back :)
its functionality will be replaced soon.

diff --git a/basis/tools/ps/windows/windows.factor b/basis/tools/ps/windows/windows.factor
index e169befe245dfbef097797dc48afb9a1402e11f2..6b6a143eb5ae068d20e1063c93d33a8f6ad196a9 100644 (file)
--- a/basis/tools/ps/windows/windows.factor
+++ b/basis/tools/ps/windows/windows.factor
@@ -1,7 +1,7 @@
 USING: accessors alien alien.c-types alien.data alien.syntax
 arrays byte-arrays classes.struct destructors fry io
 io.encodings.string io.encodings.utf16n kernel literals locals
-math nested-comments sequences strings system tools.ps
+math sequences strings system tools.ps
 windows.errors windows.handles windows.kernel32 windows.ntdll
 windows.types ;
 IN: tools.ps.windows

diff --git a/basis/windows/registry/registry.factor b/basis/windows/registry/registry.factor
index 060f9d71627ecbb912260b28e41bfb70cf2e9929..968b52fbe49730285c7962f7f994edbe6de6d389 100644 (file)
--- a/basis/windows/registry/registry.factor
+++ b/basis/windows/registry/registry.factor
@@ -3,7 +3,7 @@
 USING: alien.c-types byte-arrays kernel locals sequences
 windows.advapi32 windows.errors math windows
 windows.kernel32 windows.time accessors alien.data
-nested-comments windows.types classes.struct continuations ;
+windows.types classes.struct continuations ;
 IN: windows.registry
 
 ERROR: open-key-failed key subkey mode error-string ;

diff --git a/extra/c/preprocessor/preprocessor-tests.factor b/extra/c/preprocessor/preprocessor-tests.factor
index f33146107e5133b8d0174097495a3120b2a3f5f4..f0ac37258a0c3956c9c9858cec9f89fda6607b99 100644 (file)
--- a/extra/c/preprocessor/preprocessor-tests.factor
+++ b/extra/c/preprocessor/preprocessor-tests.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test c.preprocessor kernel accessors multiline
-nested-comments ;
+USING: tools.test c.preprocessor kernel accessors multiline ;
 IN: c.preprocessor.tests
 
 [ "vocab:c/tests/test1/test1.c" start-preprocess-file ]
@@ -10,18 +9,10 @@ IN: c.preprocessor.tests
 { "yo\n\n\n\nyo4\n" }
 [ "vocab:c/tests/test2/test2.c" start-preprocess-file nip ] unit-test
 
-(*
+/*
 [ "vocab:c/tests/test3/test3.c" start-preprocess-file ]
 [ "\"BOO\"" = ] must-fail-with
-*)
+*/
 
 { V{ "\"omg\"" "\"lol\"" } }
 [ "vocab:c/tests/test4/test4.c" start-preprocess-file drop warnings>> ] unit-test
-
-
-(*
-f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);
-f(2 * (2+(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1);
-int i[] = { 1, 23, 4, 5, };
-char c[2][6] = { "hello", "" };
-*)

diff --git a/extra/forestdb/lib/lib-tests.factor b/extra/forestdb/lib/lib-tests.factor
index ba21cec34e0ea7b27fda0491d797c701df83b30b..402a736857dc5c0e2d2b6dddaf24d1c76fc5e1a0 100644 (file)
--- a/extra/forestdb/lib/lib-tests.factor
+++ b/extra/forestdb/lib/lib-tests.factor
@@ -6,7 +6,7 @@ combinators.short-circuit constructors continuations destructors
 forestdb.ffi forestdb.utils fry generalizations io.directories
 io.encodings.string io.encodings.utf8 io.files.temp io.pathnames
 kernel layouts libc make math math.parser math.ranges multiline
-namespaces sequences system tools.test nested-comments ;
+namespaces sequences system tools.test ;
 IN: forestdb.lib
 
 { [ cell-bits 32 = ] [ os windows? ] } 0&& [

diff --git a/extra/nested-comments/nested-comments-tests.factor b/extra/nested-comments/nested-comments-tests.factor
deleted file mode 100644 (file)
index ae65b6a..0000000
--- a/extra/nested-comments/nested-comments-tests.factor
+++ /dev/null
@@ -1,43 +0,0 @@
-! Copyright (C) 2009 Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
-USING: accessors eval kernel lexer nested-comments tools.test ;
-IN: nested-comments.tests
-
-! Correct
-{ } [
-    "USE: nested-comments (* comment *)" eval( -- )
-] unit-test
-
-{ } [
-    "USE: nested-comments (* comment*)" eval( -- )
-] unit-test
-
-{ } [
-    "USE: nested-comments (* comment
-*)" eval( -- )
-] unit-test
-
-{ } [
-    "USE: nested-comments (* comment
-*)" eval( -- )
-] unit-test
-
-{ } [
-    "USE: nested-comments (* comment
-*)" eval( -- )
-] unit-test
-
-{ } [
-    "USE: nested-comments (* comment
-    (* *)
-
-*)" eval( -- )
-] unit-test
-
-! Malformed
-[
-    "USE: nested-comments (* comment
-    (* *)" eval( -- )
-] [
-    error>> T{ unexpected f "*)" f } =
-] must-fail-with

diff --git a/extra/nested-comments/nested-comments.factor b/extra/nested-comments/nested-comments.factor
deleted file mode 100644 (file)
index 190f10e..0000000
--- a/extra/nested-comments/nested-comments.factor
+++ /dev/null
@@ -1,22 +0,0 @@
-! Copyright (C) 2009 blei, Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
-USING: kernel locals make math multiline sequences ;
-IN: nested-comments
-
-: (count-subsequences) ( count substring string n -- count' )
-    [ 2dup ] dip start* [
-        pick length +
-        [ 1 + ] 3dip (count-subsequences)
-    ] [
-        2drop
-    ] if* ;
-
-: count-subsequences ( subseq seq -- n )
-    [ 0 ] 2dip 0 (count-subsequences) ;
-
-: parse-nestable-comment ( parsed-vector left-to-parse -- parsed-vector )
-    1 - "*)" parse-multiline-string
-    [ "(*" ] dip
-    count-subsequences + dup 0 > [ parse-nestable-comment ] [ drop ] if ;
-
-SYNTAX: (* 1 parse-nestable-comment ;

diff --git a/extra/progress-bars/models/models.factor b/extra/progress-bars/models/models.factor
index 66b53160bef444e15860929e06c4ab8f31b7052f..9ec5a3d31f6d348ab1a35f3104559bb2b4b1085f 100644 (file)
--- a/extra/progress-bars/models/models.factor
+++ b/extra/progress-bars/models/models.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2011 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar fonts fry io io.files io.files.info
-kernel math models models.arrow namespaces nested-comments
-progress-bars threads ui.gadgets.labels ui.gadgets.panes ;
+kernel math models models.arrow namespaces progress-bars
+threads ui.gadgets.labels ui.gadgets.panes ;
 IN: progress-bars.models
 
 SYMBOL: progress-bar