Skip to content

Commit

Permalink
more change
Browse files Browse the repository at this point in the history
  • Loading branch information
StunxFS committed Dec 26, 2023
1 parent a490860 commit 540b21f
Show file tree
Hide file tree
Showing 20 changed files with 24 additions and 55 deletions.
6 changes: 2 additions & 4 deletions cmd/src/rivet.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/console;
import std/process;
import std/{ console, process };

import rivet;
import rivet/prefs;
import rivet/utils;
import rivet/{ prefs, utils };

import ./tools;

Expand Down
3 changes: 1 addition & 2 deletions cmd/src/tools/cmd_fmt.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/flag;
import std/console;
import std/{ flag, console };
import std/fs.Directory;

import rivet/{ ast, fmt, prefs, utils, parser };
Expand Down
3 changes: 2 additions & 1 deletion cmd/src/tools/cmd_new.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/{ flag, semver, strings, console, process, fs.{ Path, Directory, self }
import std/{
flag, semver, strings, console, process, fs.{ Path, Directory, self }
};

import rivet/{ build, utils };
Expand Down
3 changes: 1 addition & 2 deletions cmd/src/tools/utils.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/console;
import std/console/styles;
import std/{ console, console/styles };

#[inline]
pub func readln(prompt: string) -> ?string {
Expand Down
5 changes: 1 addition & 4 deletions lib/rivet/src/ast/CHeader.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/traits;
import std/process;
import std/strings;
import std/fs.Path;
import std/{ traits, process, strings, fs.Path };

import ../token;

Expand Down
3 changes: 1 addition & 2 deletions lib/rivet/src/ast/Env.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/sys;
import std/fs.Path;
import std/{ sys, fs.Path };

import ../prefs;
import ../report;
Expand Down
3 changes: 1 addition & 2 deletions lib/rivet/src/ast/Expr.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/traits;
import std/strings;
import std/{ traits, strings };

import ../token;

Expand Down
3 changes: 1 addition & 2 deletions lib/rivet/src/ast/Sym.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/traits;
import std/strings;
import std/{ traits, strings };

import ../token;

Expand Down
4 changes: 1 addition & 3 deletions lib/rivet/src/ast/Type.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/traits;
import std/process;
import std/strings.Builder;
import std/{ traits, process, strings.Builder };

import ../token;
import ../utils;
Expand Down
7 changes: 3 additions & 4 deletions lib/rivet/src/builder/mod.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/traits;
import std/console;
import std/process;
import std/fs.{ Path, Directory };
import std/{
traits, console, process, fs.{ Path, Directory }
};

import ../ast;
import ../utils;
Expand Down
3 changes: 1 addition & 2 deletions lib/rivet/src/codegen/mir/Block.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/traits;
import std/strings;
import std/{ traits, strings };

#[boxed]
pub struct Block < traits.Stringable {
Expand Down
3 changes: 1 addition & 2 deletions lib/rivet/src/codegen/mir/Expr.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/traits;
import std/strings;
import std/{ traits, strings };

#[boxed; default_value(.Empty)]
pub enum Expr < traits.Stringable {
Expand Down
4 changes: 1 addition & 3 deletions lib/rivet/src/codegen/mir/Type.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/traits;
import std/strings;
import std/process;
import std/{ process, traits, strings };

#[boxed; default_value(.Void)]
pub enum Type < traits.Stringable {
Expand Down
4 changes: 1 addition & 3 deletions lib/rivet/src/codegen/mir/mod.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/fs;
import std/traits;
import std/strings;
import std/{ fs, traits, strings };

import ../../utils;

Expand Down
3 changes: 1 addition & 2 deletions lib/rivet/src/fmt/mod.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/traits;
import std/strings;
import std/{ traits, strings };

import ../ast;
import ../prefs;
Expand Down
6 changes: 1 addition & 5 deletions lib/rivet/src/prefs/mod.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/env;
import std/sys;
import std/flag;
import std/process;
import std/fs.Path;
import std/{ env, sys, flag, process, fs.Path };

import ../utils;

Expand Down
4 changes: 1 addition & 3 deletions lib/rivet/src/report/mod.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/traits;
import std/strings;
import std/console;
import std/{ traits, strings, console };

import ../prefs;
import ../token;
Expand Down
3 changes: 1 addition & 2 deletions lib/rivet/src/tokenizer/mod.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/strings;
import std/process;
import std/{ process, strings };

import ../ast;
import ../token;
Expand Down
4 changes: 1 addition & 3 deletions lib/rivet/src/utils/file.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/env;
import std/process;
import std/fs.{ self, Path };
import std/{ env, process, fs.{ self, Path } };

var normalized_wd := process.wd_at_startup.replace("\\", "/").concat("/");
var error_paths_abs := (env.get("RIVET_ERROR_PATHS") ?? "relative") == "absolute";
Expand Down
5 changes: 1 addition & 4 deletions lib/rivet/src/utils/mod.ri
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
// source code is governed by an MIT license that can be found in the LICENSE
// file.

import std/traits;
import std/console;
import std/process;
import std/console/styles;
import std/{ traits, console, process, console/styles };

pub const LF: uint8 := 10;
pub const CR: uint8 := 13;
Expand Down

0 comments on commit 540b21f

Please sign in to comment.