Skip to content

Commit

Permalink
[io] Switch users over to 'use io'.
Browse files Browse the repository at this point in the history
This is the start of migrating to being the same as Open Dylan
where streams, format, format-out, print, pprint, and standard-io
are available via the io library rather than separate libraries.

Work in progress on #37.
  • Loading branch information
waywardmonkeys committed Oct 25, 2015
1 parent 56704f8 commit 5cffab3
Show file tree
Hide file tree
Showing 38 changed files with 39 additions and 88 deletions.
3 changes: 1 addition & 2 deletions demos/cat/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ module: dylan-user
define library cat
use Dylan;
use streams;
use Standard-IO;
use io;
end;

define module cat
Expand Down
4 changes: 1 addition & 3 deletions demos/diff/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ module: dylan-user
define library diff
use dylan;
use streams;
use standard-io;
use format;
use io;
use collection-extensions;
end library diff;

Expand Down
3 changes: 1 addition & 2 deletions demos/html2txt/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ Module: dylan-user

define library html
use dylan;
use streams;
use standard-io;
use io;
use collection-extensions;
use string-extensions;
end library html;
Expand Down
4 changes: 1 addition & 3 deletions demos/minesweeper/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ define library minesweeper
use dylan;
use tk;
use string-extensions;
use streams;
use standard-io;
use format;
use io;
use random;
end library minesweeper;

Expand Down
3 changes: 1 addition & 2 deletions demos/stream-demo/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ module: dylan-user

define library stream-demo
use dylan;
use streams;
use standard-io;
use io;
end library;

define module stream-demo
Expand Down
3 changes: 1 addition & 2 deletions demos/tk-html2txt/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ Module: dylan-user

define library html
use dylan;
use streams;
use standard-io;
use io;
use collection-extensions;
use string-extensions;
use tk;
Expand Down
2 changes: 1 addition & 1 deletion libraries/base-file-system/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ author: Douglas M. Auclair, [email protected]
define library base-file-system
use dylan;
use io;
use regular-expressions;
use streams;
use string-extensions;

export base-file-system;
Expand Down
8 changes: 1 addition & 7 deletions libraries/debugger-format/debugger-format.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,7 @@ module: debugger-format

define library debugger-format
use Dylan;
use streams;
use Standard-IO;
//
// We use the format library even though we don't reference anything in
// it to make sure it is loaded. Otherwise, there won't be a <stream>
// method on condition-format and condition-force-output.
use Format;
use io;
end;

define module debugger-format
Expand Down
2 changes: 1 addition & 1 deletion libraries/inspector/inspector-base.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ copyright: See below.

define library inspector-base
use dylan;
use print;
use io;
use string-extensions;
use regular-expressions;
export
Expand Down
4 changes: 1 addition & 3 deletions libraries/inspector/text-inspector.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ copyright: See below.

define library text-inspector
use dylan;
use streams;
use standard-io;
use print;
use io;
use string-extensions;
use inspector-base;
export
Expand Down
3 changes: 1 addition & 2 deletions libraries/parse-arguments/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ define library parse-arguments

#if (~mindy)
// for argument-parser-definer
use streams;
use format;
use io;
#endif

export
Expand Down
2 changes: 1 addition & 1 deletion libraries/stream-extensions/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ copyright: See below.

define library stream-extensions
use dylan;
use streams;
use io;
export
stream-extensions, indenting-streams, concatenated-streams;
end library stream-extensions;
Expand Down
2 changes: 1 addition & 1 deletion libraries/tk/eager-stream.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module: eager-stream

define library stream-extensions
use dylan;
use streams;
use io;

export eager-stream;
end library stream-extensions;
Expand Down
4 changes: 1 addition & 3 deletions libraries/tk/test.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ author: Robert Stockton ([email protected])

define library test
use dylan;
use streams;
use standard-io;
use io;
use stream-extensions;
use format;
use tk;
end library test;

Expand Down
4 changes: 1 addition & 3 deletions libraries/tk/tk-library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,11 @@ author: Robert Stockton ([email protected])

define library tk
use dylan;
use streams;
use standard-io;
use io;
use string-extensions;
use collection-extensions;
use table-extensions;
use regular-expressions;
use format;
export tk;
export tk-extension;
end library tk;
Expand Down
2 changes: 1 addition & 1 deletion tests/coll-ext-test-exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module: Dylan-user
define library coll-ext-test
use Dylan;
use Collection-Extensions;
use Print;
use io;
end library coll-ext-test;

define module coll-ext-test
Expand Down
3 changes: 1 addition & 2 deletions tests/dylan-test-exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ module: Dylan-user

define library dylan-test
use dylan;
// use streams;
// use standard-io;
// use io;
end library dylan-test;

define module dylan-test
Expand Down
4 changes: 1 addition & 3 deletions tests/format-out-test-exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ module: Dylan-user

define library format-out-test
use Dylan;
use Standard-io;
use Format-out;
use Streams;
use io;
end library format-out-test;

define module format-out-test
Expand Down
3 changes: 1 addition & 2 deletions tests/format-test-exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ module: Dylan-User

define library format-test
use Dylan;
use Format;
use Print;
use io;
end library format-test;

define module format-test
Expand Down
2 changes: 1 addition & 1 deletion tests/getopt-test-exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ copyright: see below

define library getopttest
use dylan;
use format-out;
use io;
use parse-arguments;
end library;

Expand Down
4 changes: 2 additions & 2 deletions tests/itime-test-exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ module: Dylan-User
define library itime-test
use Dylan;
use Internal-Time;
use Print;
use io;
end library itime-test;

define module itime-test
use Dylan;
use Extensions;
use Internal-Time;
use Cheap-io;
end module itime-test;
end module itime-test;
3 changes: 1 addition & 2 deletions tests/matrix-test-exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ module: Dylan-User
define library matrix-test
use Dylan;
use Matrix;
use Streams;
use Standard-IO;
use io;
end library matrix-test;

define module matrix-test
Expand Down
2 changes: 1 addition & 1 deletion tests/print-test-exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module: Dylan-User

define library print-test
use Dylan;
use Print;
use io;
end library print-test;

define module print-test
Expand Down
2 changes: 1 addition & 1 deletion tests/stream-test-exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ copyright: see below

define library stream-test
use dylan;
use streams;
use io;
end library stream-test;

define module stream-test
Expand Down
4 changes: 1 addition & 3 deletions tests/threaded-io-test.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ copyright: see below

define library Threaded-io-test
use dylan;
use streams;
use standard-io;
// use format;
use io;
end library Threaded-io-test;

define module threaded-io-test
Expand Down
3 changes: 1 addition & 2 deletions tests/time-test-exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ module: Dylan-User
define library time-test
use Dylan;
use Time;
use Streams;
use Standard-io;
use io;
end library time-test;

define module time-test
Expand Down
2 changes: 1 addition & 1 deletion to-be-migrated/common-dylan/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ define library common-dylan
use threads, export: { threads };

use melange-support;
use streams;
use io;
use table-extensions;
use random;
use transcendental,
Expand Down
2 changes: 1 addition & 1 deletion to-be-migrated/date/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ define library date
use dylan;
use collection-extensions;
use string-extensions;
use streams;
use io;
use time;

export date;
Expand Down
3 changes: 1 addition & 2 deletions to-be-migrated/file-system/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ define library file-system
use dylan;
use melange-support;
use regular-expressions;
use streams;
use format-out;
use io;
use string-extensions;
use base-file-system;

Expand Down
3 changes: 1 addition & 2 deletions to-be-migrated/time/days-since-1970.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ copyright: See below.

define library Test
use Dylan;
use Streams;
use Format;
use io;
end;

define module Test
Expand Down
3 changes: 1 addition & 2 deletions to-be-migrated/time/dow-table.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ copyright: See below.

define library Test
use Dylan;
use Streams;
use Format;
use io;
end;

define module Test
Expand Down
4 changes: 1 addition & 3 deletions to-be-migrated/time/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ copyright: See below.

define library Time
use Dylan;
use io;
use String-extensions;
use Streams;
use Print;
use Format;
use Table-extensions;
#if (~mindy)
use Melange-support;
Expand Down
5 changes: 1 addition & 4 deletions tools/lisp2dylan/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,9 @@ copyright: see below

define library lisp2dylan
use dylan;
use streams;
use print;
use format;
use io;
use string-extensions;
use regular-expressions;
use standard-io;
end library lisp2dylan;

define module lisp2dylan
Expand Down
5 changes: 1 addition & 4 deletions tools/make-exports/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ copyright: see below

define library make-exports
use dylan;
use streams;
use standard-io;
use print;
use format;
use io;
use table-extensions;
use string-extensions;
use regular-expressions;
Expand Down
4 changes: 1 addition & 3 deletions tools/melange/c-exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ define library melange-c
use collection-extensions;
use regular-expressions;
use table-extensions;
use streams;
use standard-io;
use format;
use io;

// General purpose utility modules.
export
Expand Down
4 changes: 1 addition & 3 deletions tools/melange/exports.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ define library melange
use string-extensions;
use collection-extensions;
use regular-expressions;
use streams;
use standard-io;
use format;
use io;
use parse-arguments;
use melange-c;
export
Expand Down
5 changes: 1 addition & 4 deletions tools/parsergen/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ module: dylan-user

define library parsergen
use dylan;
use streams;
use print;
use format;
use standard-io;
use io;
use string-extensions;
use regular-expressions;
end library parsergen;
Expand Down
Loading

0 comments on commit 5cffab3

Please sign in to comment.