more changes

Author: StunxFS

lib/rivet/src/ast/Env.ri

@@ -8,20 +8,20 @@ import ../{ prefs, report, utils };
 
 #[boxed]
 pub struct Env {
-    pub mut prefs: prefs.Prefs;
-    pub mut source_files: []mut +SourceFile;
+    pub prefs: +mut prefs.Prefs;
+    pub mut source_files: []+mut SourceFile;
 
     pub pointer_size: uint;
 
     /// `.universe` is the mega-module where all the modules being
     /// compiled reside.
-    pub mut universe: +Module;
+    pub universe: +mut Module;
 
     pub mut c_defines: CDefines;
     pub mut c_include_paths: []string;
     pub mut c_user_include_paths: []string;
 
-    pub mut core_mod: +Module;
+    pub core_mod: +mut Module;
     pub mut throwable_sym_is_set: bool;
 
     pub mut builtins: []Builtin;
@@ -68,10 +68,10 @@ pub struct Env {
     pub mut throwable_t: +Type;
 
     #[inline]
-    pub func new(prefs_: prefs.Prefs) -> +Env {
+    pub func new(prefs_: +mut prefs.Prefs) -> +mut Self {
         report.report_table.prefs = prefs_;
         universe_ := universe();
-        mut env := Env(
+        env := +mut Env(
             prefs: prefs_,
             universe: universe_,
             pointer_size: if prefs_.target_is_64bit {
@@ -85,7 +85,7 @@ pub struct Env {
         return env;
     }
 
-    pub func setup_primitives(mut self) {
+    pub func setup_primitives(+mut self) {
         self.bool_sym = self.universe.scope.find_type_symbol_by_index_or_panic(0);
         self.rune_sym = self.universe.scope.find_type_symbol_by_index_or_panic(1);
         self.int8_sym = self.universe.scope.find_type_symbol_by_index_or_panic(2);
@@ -123,7 +123,7 @@ pub struct Env {
         self.string_t = .Basic(self.string_sym);
     }
 
-    pub func filter_files(self, inputs: []string) -> []string {
+    pub func filter_files(+self, inputs: []string) -> []string {
         mut new_inputs := []string(cap: inputs.len);
         for input in inputs {
             base_name_input := Path.base_name(input);

lib/rivet/src/ast/Expr.ri

@@ -297,15 +297,15 @@ pub enum Expr < traits.Stringable {
     };
 
     #[inline]
-    pub func clean_paren(self) -> Self {
+    pub func clean_paren(+self) -> +Self {
         return if self is .Paren(paren) {
             paren.clean_paren()
         } else {
             self
         };
     }
 
-    pub func position(self) -> token.Pos {
+    pub func position(+self) -> token.Pos {
         return match self {
             .Empty(empty_pos) -> empty_pos,
             .Comment(comment) -> comment.pos,
@@ -345,8 +345,7 @@ pub enum Expr < traits.Stringable {
         };
     }
 
-    #[inline]
-    pub func to_string(self) -> string {
+    pub func to_string(+self) -> string {
         return match self {
             .Empty -> "<empty-expression>",
             .Comment -> "<comment>",

lib/rivet/src/ast/TypeSym.ri

@@ -21,7 +21,7 @@ pub struct TypeSym < Sym {
     pub mut align: uint;
     pub mut default_value: ?+Expr;
 
-    pub func lookup_field(self, name: string) -> ?Field {
+    pub func lookup_field(+self, name: string) -> ?Field {
         for f in self.fields {
             if f.name == name {
                 return f;
@@ -49,20 +49,20 @@ pub struct TypeSym < Sym {
     }
 
     #[inline]
-    pub func has_field(self, name: string) -> bool {
+    pub func has_field(+self, name: string) -> bool {
         return self.lookup_field(name) != none;
     }
 
     #[inline]
-    pub func lookup(self, name: string) -> ?Sym {
+    pub func lookup(+self, name: string) -> ?Sym {
         return if s := self.scope.lookup(name) {
             s
         } else {
             none
         };
     }
 
-    pub func find_in_base(self, name: string) -> ?Sym {
+    pub func find_in_base(+self, name: string) -> ?Sym {
          if self.info is .Trait(trait_info) {
             for b in trait_info.bases {
                 if s := b.scope.find(name) {
@@ -91,7 +91,7 @@ pub struct TypeSym < Sym {
     }
 
     #[inline]
-    pub func find_func(self, name: string) -> ?+Func {
+    pub func find_func(+self, name: string) -> ?+Func {
         return if sym := self.scope.find(name); sym is Func(func_) {
             if self.info !is .Trait && !func_.has_body {
                 return none;
@@ -108,7 +108,7 @@ pub struct TypeSym < Sym {
     }
 
     #[inline]
-    pub func find_method(self, name: string) -> ?+Func {
+    pub func find_method(+self, name: string) -> ?+Func {
         return if func_ := self.find_func(name); func_.is_method {
             func_
         } else {
@@ -117,16 +117,16 @@ pub struct TypeSym < Sym {
     }
 
     #[inline]
-    pub func has_func(self, name: string) -> bool {
+    pub func has_func(+self, name: string) -> bool {
         return self.find_func(name) != none;
     }
 
     #[inline]
-    pub func has_method(self, name: string) -> bool {
+    pub func has_method(+self, name: string) -> bool {
         return self.find_method(name) != none;
     }
 
-    pub func full_fields(mut self) -> []Field {
+    pub func full_fields(+mut self) -> []Field {
         if !self.full_fields_.is_empty() {
             return self.full_fields_;
         }
@@ -157,15 +157,15 @@ pub struct TypeSym < Sym {
     }
 
     #[inline]
-    pub func implement_trait(self, trait_sym: +TypeSym) -> bool {
+    pub func implement_trait(+self, trait_sym: +TypeSym) -> bool {
         return if trait_sym.info is .Trait(trait_info) {
             self in trait_info.implements
         } else {
             false
         };
     }
 
-    pub func update(mut self, other: +TypeSym) -> !bool {
+    pub func update(+mut self, other: +TypeSym) -> !bool {
         if self.info is .Placeholder {
             // update placeholder
             if other.info !is .Placeholder {
@@ -182,7 +182,7 @@ pub struct TypeSym < Sym {
     }
 
     #[inline]
-    pub func is_boxed(self) -> bool {
+    pub func is_boxed(+self) -> bool {
         return match self.info {
             .Trait -> true,
             .Struct(struct_info) -> struct_info.is_boxed,
@@ -192,17 +192,17 @@ pub struct TypeSym < Sym {
     }
 
     #[inline]
-    pub func is_primitive(self) -> bool {
+    pub func is_primitive(+self) -> bool {
         return self.info.is_primitive();
     }
 
     #[inline]
-    pub func ==(self, rhs: Self) -> bool {
+    pub func ==(+self, rhs: +Self) -> bool {
         return self.id == rhs.id;
     }
 
     #[inline]
-    pub func !=(self, rhs: Self) -> bool {
+    pub func !=(+self, rhs: +Self) -> bool {
         return self.id != rhs.id;
     }
 }