Change Declaration passing to use Ptr (#758)

executable_semantics/interpreter/interpreter.cpp

@@ -183,8 +183,8 @@ void InitEnv(const Declaration& d, Env* env) {
   }
 }
 
-static void InitGlobals(const std::list<const Declaration*>& fs) {
-  for (const auto* d : fs) {
+static void InitGlobals(const std::list<Ptr<const Declaration>>& fs) {
+  for (const auto d : fs) {
     InitEnv(*d, &globals);
   }
 }
@@ -1236,7 +1236,7 @@ void Step() {
 }
 
 // Interpret the whole porogram.
-auto InterpProgram(const std::list<const Declaration*>& fs) -> int {
+auto InterpProgram(const std::list<Ptr<const Declaration>>& fs) -> int {
   state = global_arena->RawNew<State>();  // Runtime state.
   if (tracing_output) {
     llvm::outs() << "********** initializing globals **********\n";

executable_semantics/interpreter/interpreter.h

@@ -40,7 +40,7 @@ void PrintEnv(Env values, llvm::raw_ostream& out);
 auto PatternMatch(const Value* p, const Value* v, int line_num)
     -> std::optional<Env>;
 
-auto InterpProgram(const std::list<const Declaration*>& fs) -> int;
+auto InterpProgram(const std::list<Ptr<const Declaration>>& fs) -> int;
 auto InterpExp(Env values, const Expression* e) -> const Value*;
 auto InterpPattern(Env values, const Pattern* p) -> const Value*;
 

executable_semantics/interpreter/typecheck.cpp

@@ -989,16 +989,16 @@ static auto GetName(const Declaration& d) -> const std::string& {
   }
 }
 
-auto MakeTypeChecked(const Declaration& d, const TypeEnv& types,
-                     const Env& values) -> const Declaration* {
-  switch (d.Tag()) {
+auto MakeTypeChecked(const Ptr<const Declaration> d, const TypeEnv& types,
+                     const Env& values) -> Ptr<const Declaration> {
+  switch (d->Tag()) {
     case Declaration::Kind::FunctionDeclaration:
-      return global_arena->RawNew<FunctionDeclaration>(TypeCheckFunDef(
-          &cast<FunctionDeclaration>(d).Definition(), types, values));
+      return global_arena->New<FunctionDeclaration>(TypeCheckFunDef(
+          &cast<FunctionDeclaration>(*d).Definition(), types, values));
 
     case Declaration::Kind::StructDeclaration: {
       const StructDefinition& struct_def =
-          cast<StructDeclaration>(d).Definition();
+          cast<StructDeclaration>(*d).Definition();
       std::list<Member*> fields;
       for (Member* m : struct_def.members) {
         switch (m->Tag()) {
@@ -1008,16 +1008,16 @@ auto MakeTypeChecked(const Declaration& d, const TypeEnv& types,
             break;
         }
       }
-      return global_arena->RawNew<StructDeclaration>(
+      return global_arena->New<StructDeclaration>(
           struct_def.line_num, struct_def.name, std::move(fields));
     }
 
     case Declaration::Kind::ChoiceDeclaration:
       // TODO
-      return &d;
+      return d;
 
     case Declaration::Kind::VariableDeclaration: {
-      const auto& var = cast<VariableDeclaration>(d);
+      const auto& var = cast<VariableDeclaration>(*d);
       // Signals a type error if the initializing expression does not have
       // the declared type of the variable, otherwise returns this
       // declaration with annotated types.
@@ -1033,7 +1033,7 @@ auto MakeTypeChecked(const Declaration& d, const TypeEnv& types,
       const Value* declared_type = InterpExp(values, type);
       ExpectType(var.LineNumber(), "initializer of variable", declared_type,
                  type_checked_initializer.type);
-      return &d;
+      return d;
     }
   }
 }
@@ -1095,7 +1095,7 @@ static void TopLevel(const Declaration& d, TypeCheckContext* tops) {
   }
 }
 
-auto TopLevel(const std::list<const Declaration*>& fs) -> TypeCheckContext {
+auto TopLevel(const std::list<Ptr<const Declaration>>& fs) -> TypeCheckContext {
   TypeCheckContext tops;
   bool found_main = false;
 

executable_semantics/interpreter/typecheck.h

@@ -10,6 +10,7 @@
 #include "common/ostream.h"
 #include "executable_semantics/ast/expression.h"
 #include "executable_semantics/ast/statement.h"
+#include "executable_semantics/common/ptr.h"
 #include "executable_semantics/interpreter/dictionary.h"
 #include "executable_semantics/interpreter/interpreter.h"
 
@@ -55,9 +56,9 @@ auto TypeCheckStmt(const Statement* s, TypeEnv types, Env values,
                    const Value*& ret_type, bool is_omitted_ret_type)
     -> TCStatement;
 
-auto MakeTypeChecked(const Declaration& decl, const TypeEnv& types,
-                     const Env& values) -> const Declaration*;
-auto TopLevel(const std::list<const Declaration*>& fs) -> TypeCheckContext;
+auto MakeTypeChecked(const Ptr<const Declaration> d, const TypeEnv& types,
+                     const Env& values) -> Ptr<const Declaration>;
+auto TopLevel(const std::list<Ptr<const Declaration>>& fs) -> TypeCheckContext;
 
 }  // namespace Carbon